From c4e097727da61e6ceb93ad2a3ef964cade9e43b6 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 24 Oct 2023 09:18:36 +0300 Subject: [PATCH] Update CMakeLists.txt --- CMakeLists.txt | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2b8654f4..de5f1f0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,12 +9,12 @@ target_compile_features(${PROJECT_NAME} PRIVATE cxx_std_17) if(MSVC) target_compile_options(${PROJECT_NAME} PRIVATE /W4) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw) + add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glm) else() target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra) endif() -option(VE_USE_SYSTEM_LIBS "Use system installed libraries" ON) - find_package(OpenGL REQUIRED) find_package(GLEW REQUIRED) find_package(OpenAL REQUIRED) @@ -27,9 +27,6 @@ else() endif(WIN32) set(LIBS "") - -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw) -add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glm) set(LIBS glm) if(UNIX) @@ -38,6 +35,6 @@ if(UNIX) endif(UNIX) -target_link_libraries(${PROJECT_NAME} ${LIBS} glfw OpenGL::GL ${OPENAL_LIBRARY} GLEW::GLEW spng) +target_link_libraries(${PROJECT_NAME} ${LIBS} glfw OpenGL::GL ${OPENAL_LIBRARY} GLEW::GLEW ${PNGLIB}) file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/build)