diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 22b9bbe74..6bcd92424 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -278,7 +278,7 @@ if(ENABLE_SINGLE_APP_BUILD) endif() endif() target_link_libraries(vcmiclient PRIVATE - ${VCMI_LIB_TARGET} SDL2::SDL2 SDL2::Image SDL2::Mixer SDL2::TTF ${ENET_LIBRARIES} + ${VCMI_LIB_TARGET} SDL2::SDL2 SDL2::Image SDL2::Mixer SDL2::TTF ) if(ffmpeg_LIBRARIES) @@ -290,8 +290,7 @@ else() endif() target_include_directories(vcmiclient - PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} - ${ENET_INCLUDE_DIRS}) + PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) vcmi_set_output_dir(vcmiclient "") enable_pch(vcmiclient) diff --git a/cmake_modules/VCMI_lib.cmake b/cmake_modules/VCMI_lib.cmake index 483a7437f..a69e8f2e7 100644 --- a/cmake_modules/VCMI_lib.cmake +++ b/cmake_modules/VCMI_lib.cmake @@ -457,7 +457,8 @@ macro(add_main_lib TARGET_NAME LIBRARY_TYPE) add_library(${TARGET_NAME} ${LIBRARY_TYPE} ${lib_SRCS} ${lib_HEADERS}) set_target_properties(${TARGET_NAME} PROPERTIES COMPILE_DEFINITIONS "VCMI_DLL=1") target_link_libraries(${TARGET_NAME} PUBLIC - minizip::minizip ZLIB::ZLIB + minizip::minizip ZLIB::ZLIB + ${ENET_LIBRARIES} ${SYSTEM_LIBS} Boost::boost Boost::thread Boost::filesystem Boost::program_options Boost::locale Boost::date_time ) if(APPLE_IOS) @@ -469,6 +470,7 @@ macro(add_main_lib TARGET_NAME LIBRARY_TYPE) PUBLIC ${MAIN_LIB_DIR}/.. PUBLIC ${MAIN_LIB_DIR}/../include PUBLIC ${MAIN_LIB_DIR} + PRIVATE ${ENET_INCLUDE_DIRS} PRIVATE ${SDL2_INCLUDE_DIR} ) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index d4c9f4e82..fe3b51478 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -1,6 +1,4 @@ add_main_lib(vcmi SHARED) -target_include_directories(vcmi PRIVATE ${ENET_INCLUDE_DIRS}) -target_link_libraries(vcmi PRIVATE ${ENET_LIBRARIES}) if(ENABLE_SINGLE_APP_BUILD) target_compile_definitions(vcmi PUBLIC VCMI_LIB_NAMESPACE=LIB_CLIENT) endif() diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index f2985643e..0677f1e8c 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -34,11 +34,10 @@ endif() if(CMAKE_SYSTEM_NAME MATCHES FreeBSD) set(server_LIBS execinfo ${server_LIBS}) endif() -target_link_libraries(vcmiserver PRIVATE ${server_LIBS} minizip::minizip ${ENET_LIBRARIES}) +target_link_libraries(vcmiserver PRIVATE ${server_LIBS} minizip::minizip) target_include_directories(vcmiserver PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} - ${ENET_INCLUDE_DIRS} ) if(WIN32)