From 6e07ea1a44fb2e3c6bb8cea4d4cb1092246b4280 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Mon, 21 Oct 2024 13:52:59 +0300 Subject: [PATCH] update CMakeLists.txt --- src/CMakeLists.txt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8cd21fbd..7cf236ef 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -14,6 +14,7 @@ find_package(OpenGL REQUIRED) find_package(GLEW REQUIRED) find_package(OpenAL REQUIRED) find_package(ZLIB REQUIRED) +find_package(PNG REQUIRED) if (NOT APPLE) find_package(EnTT REQUIRED) endif() @@ -26,11 +27,9 @@ if (WIN32) find_package(spng REQUIRED) find_package(glm REQUIRED) find_package(vorbis REQUIRED) - set(PNGLIB spng::spng) set(VORBISLIB Vorbis::vorbis Vorbis::vorbisfile) else() find_package(Lua REQUIRED) - set(PNGLIB spng) set(VORBISLIB vorbis vorbisfile) # not tested add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw) endif() @@ -42,8 +41,7 @@ elseif(APPLE) set(LUA_LIBRARIES "/opt/homebrew/lib/libluajit-5.1.a") message(STATUS "LUA Libraries: ${LUA_LIBRARIES}") message(STATUS "LUA Include Dir: ${LUA_INCLUDE_DIR}") - find_package(PNG REQUIRED) - set(PNGLIB PNG::PNG) + set(VORBISLIB ${VORBIS_LDFLAGS}) message(STATUS "Vorbis Lib: ${VORBIS_LDFLAGS}") else() @@ -52,8 +50,6 @@ else() pkg_check_modules(VORBIS REQUIRED vorbis vorbisfile) set(LUA_LIBRARIES ${LUAJIT_LIBRARIES}) set(LUA_INCLUDE_DIR ${LUAJIT_INCLUDE_DIRS}) - find_package(PNG REQUIRED) - set(PNGLIB PNG::PNG) set(VORBISLIB ${VORBIS_LDFLAGS}) endif() @@ -67,4 +63,4 @@ endif() include_directories(${LUA_INCLUDE_DIR}) target_include_directories(${PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(${PROJECT_NAME} ${LIBS} glfw OpenGL::GL ${OPENAL_LIBRARY} GLEW::GLEW ZLIB::ZLIB ${VORBISLIB} ${PNGLIB} ${LUA_LIBRARIES} ${CMAKE_DL_LIBS}) +target_link_libraries(${PROJECT_NAME} ${LIBS} glfw OpenGL::GL ${OPENAL_LIBRARY} GLEW::GLEW ZLIB::ZLIB PNG::PNG ${VORBISLIB} ${LUA_LIBRARIES} ${CMAKE_DL_LIBS})