diff --git a/Lib/LibStatic/CMakeLists.txt b/Lib/LibStatic/CMakeLists.txt index 231bf71..703b056 100644 --- a/Lib/LibStatic/CMakeLists.txt +++ b/Lib/LibStatic/CMakeLists.txt @@ -21,15 +21,7 @@ FILE(GLOB CRYPTO_CPP_SRCS ${SLikeNet_SOURCE_DIR}/Source/src/crypto/*.cpp) add_library(SLikeNetLibStatic STATIC ${ALL_CPP_SRCS} ${CRYPTO_CPP_SRCS} ${ALL_HEADER_SRCS}) -#if(NOT (CMAKE_VERSION VERSION_LESS 2.8)) - # target_include_directories is only supported since CMake 2.8 -# target_include_directories(SLikeNetLibStatic PUBLIC -# $ -# $ -# ) -#else() - include_directories(${SLIKENET_INTERNAL_INCLUDE_DIRS}) -#endif() +target_include_directories(SLikeNetLibStatic PUBLIC ${SLikeNet_SOURCE_DIR}/Source/include) # set the version number set_target_properties(SLikeNetLibStatic PROPERTIES @@ -49,18 +41,5 @@ ELSE(WIN32 AND NOT UNIX) ) ENDIF(WIN32 AND NOT UNIX) -target_link_libraries(SLikeNetLibStatic ${SLIKENET_LIBRARY_LIBS}) -IF(WIN32 AND NOT UNIX) - IF(NOT ${CMAKE_GENERATOR} STREQUAL "MSYS Makefiles") - set_target_properties(SLikeNetLibStatic PROPERTIES STATIC_LIBRARY_FLAGS "/NODEFAULTLIB:\"LIBCD.lib LIBCMTD.lib MSVCRT.lib\"" ) - ENDIF(NOT ${CMAKE_GENERATOR} STREQUAL "MSYS Makefiles") -ELSE(WIN32 AND NOT UNIX) - configure_file(../../slikenet-config-version.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/slikenet-config-version.cmake @ONLY) +target_link_libraries(SLikeNetLibStatic PRIVATE ${SLIKENET_LIBRARY_LIBS}) - INSTALL(TARGETS SLikeNetLibStatic EXPORT SLikeNetLibStatic DESTINATION lib/slikenet-${SLikeNet_VERSION}) - INSTALL(FILES ${ALL_COMPATIBILITY_HEADER_SRC} DESTINATION include/slikenet-${SLikeNet_VERSION}) - INSTALL(FILES ${ALL_COMPATIBILITY_HEADER_SRC_2} DESTINATION include/slikenet-${SLikeNet_VERSION}/slikenet) - INSTALL(FILES ${ALL_HEADER_SRCS} DESTINATION include/slikenet-${SLikeNet_VERSION}/include/slikenet) - INSTALL(FILES ../../slikenet-config.cmake ${CMAKE_CURRENT_BINARY_DIR}/slikenet-config-version.cmake DESTINATION lib/slikenet-${SLikeNet_VERSION}) - INSTALL(EXPORT SLikeNetLibStatic FILE slikenet.cmake DESTINATION lib/slikenet-${SLikeNet_VERSION}) -ENDIF(WIN32 AND NOT UNIX)