diff options
| -rw-r--r-- | ArchiveEx/CMakeLists.txt | 42 | ||||
| -rw-r--r-- | StarsEx/CMakeLists.txt | 1 |
2 files changed, 12 insertions, 31 deletions
diff --git a/ArchiveEx/CMakeLists.txt b/ArchiveEx/CMakeLists.txt index 99ea254..faaedda 100644 --- a/ArchiveEx/CMakeLists.txt +++ b/ArchiveEx/CMakeLists.txt @@ -1,33 +1,15 @@ project(ArchiveEx) -add_library( - ArchiveEx - Archive.cpp - ) -target_include_directories( - ArchiveEx - PUBLIC . - ) -target_link_libraries( - ArchiveEx - PRIVATE Zlib::zlib - ) -add_executable( - dat - dat.cpp - ) -target_link_libraries( - dat - PRIVATE ArchiveEx - ) + + +add_library(${PROJECT_NAME} SHARED Archive.cpp) +target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_link_libraries(${PROJECT_NAME} PRIVATE Zlib::zlibstatic) +install(TARGETS ${PROJECT_NAME} RUNTIME COMPONENT Runtime DESTINATION ${CMAKE_INSTALL_PREFIX}) + + +add_executable(dat dat.cpp) +target_link_libraries(dat PRIVATE ${PROJECT_NAME}) if(WIN32) - target_link_libraries( - dat - PRIVATE -l:libshlwapi.a - ) + target_link_libraries(dat PRIVATE -lshlwapi) endif() -install( - TARGETS dat - RUNTIME - COMPONENT Runtime - DESTINATION ${CMAKE_INSTALL_PREFIX} - ) +install(TARGETS dat RUNTIME COMPONENT Tools DESTINATION ${CMAKE_INSTALL_PREFIX}) diff --git a/StarsEx/CMakeLists.txt b/StarsEx/CMakeLists.txt index 0f56b97..1dc025d 100644 --- a/StarsEx/CMakeLists.txt +++ b/StarsEx/CMakeLists.txt @@ -278,7 +278,6 @@ target_link_libraries( PUBLIC DefinitionEx PUBLIC FoundationEx PUBLIC NetEx - PUBLIC Zlib::zlib PUBLIC Vorbis::vorbis PUBLIC Vorbis::vorbisfile PUBLIC Ogg::ogg |