diff options
| -rw-r--r-- | cmake/platform/settings.win32.cmake | 3 | ||||
| -rw-r--r-- | dep/g3dlite/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/server/authserver/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | src/server/shared/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/server/worldserver/CMakeLists.txt | 54 | ||||
| -rw-r--r-- | src/tools/map_extractor/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | src/tools/vmap3_assembler/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | src/tools/vmap3_extractor/CMakeLists.txt | 18 |
8 files changed, 49 insertions, 109 deletions
diff --git a/cmake/platform/settings.win32.cmake b/cmake/platform/settings.win32.cmake index f55f5702439..3e2df0c97ee 100644 --- a/cmake/platform/settings.win32.cmake +++ b/cmake/platform/settings.win32.cmake @@ -1,5 +1,8 @@ # Package overloads set(ACE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/dep/acelite) +set(ACE_LIBRARY "ace") +set(BZIP2_LIBRARIES "bzip2") +set(ZLIB_LIBRARIES "zlib") # check the CMake preload parameters (commented out by default) diff --git a/dep/g3dlite/CMakeLists.txt b/dep/g3dlite/CMakeLists.txt index 96cfc5f9cc9..03b3beea637 100644 --- a/dep/g3dlite/CMakeLists.txt +++ b/dep/g3dlite/CMakeLists.txt @@ -67,12 +67,7 @@ endif() add_library(g3dlib STATIC ${g3dlib_STAT_SRCS}) -if(WIN32) - target_link_libraries(g3dlib - zlib - ) -else() - target_link_libraries(g3dlib - ${ZLIB_LIBRARIES} - ) +target_link_libraries(g3dlib + ${ZLIB_LIBRARIES} +) endif() diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt index e8c94866867..7b0ee197858 100644 --- a/src/server/authserver/CMakeLists.txt +++ b/src/server/authserver/CMakeLists.txt @@ -84,23 +84,13 @@ endif() set_target_properties(authserver PROPERTIES LINK_FLAGS "${authserver_LINK_FLAGS}") -if( WIN32 ) - target_link_libraries( - authserver - shared - ${MYSQL_LIBRARY} - ${OPENSSL_LIBRARIES} - ${OPENSSL_EXTRA_LIBRARIES} - ) -else() - target_link_libraries( - authserver - shared - ${MYSQL_LIBRARY} - ${OPENSSL_LIBRARIES} - ${OSX_LIBS} - ) -endif() +target_link_libraries(authserver + shared + ${MYSQL_LIBRARY} + ${OPENSSL_LIBRARIES} + ${OPENSSL_EXTRA_LIBRARIES} + ${OSX_LIBS} +) if( WIN32 ) add_custom_command(TARGET authserver diff --git a/src/server/shared/CMakeLists.txt b/src/server/shared/CMakeLists.txt index 4a425642ad5..6549c6e91ad 100644 --- a/src/server/shared/CMakeLists.txt +++ b/src/server/shared/CMakeLists.txt @@ -78,15 +78,9 @@ add_library(shared STATIC ${shared_STAT_SRCS}) add_dependencies(shared genrev) -if(WIN32) - target_link_libraries(shared - ace - ) -else() - target_link_libraries(shared - ${ACE_LIBRARY} - ) -endif() +target_link_libraries(shared + ${ACE_LIBRARY} +) # Generate precompiled header if( USE_COREPCH ) diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 280f3a469ac..d6b25c5e139 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -167,42 +167,24 @@ else() set(SCRIPT_LIB "") endif() -if( WIN32 ) - target_link_libraries( - worldserver - game - shared - zlib - trinitysockets - collision - g3dlib - gsoap - ace - ${SCRIPT_LIB} - ${MYSQL_LIBRARY} - ${OPENSSL_LIBRARIES} - ${OPENSSL_EXTRA_LIBRARIES} - ) -else() - target_link_libraries( - worldserver - game - shared - trinitysockets - collision - g3dlib - gsoap - ${JEMALLOC_LIB} - ${SCRIPT_LIB} - ${READLINE_LIBRARY} - ${TERMCAP_LIBRARY} - ${ACE_LIBRARY} - ${MYSQL_LIBRARY} - ${OPENSSL_LIBRARIES} - ${ZLIB_LIBRARIES} - ${OSX_LIBS} - ) -endif() +target_link_libraries(worldserver + game + shared + trinitysockets + collision + g3dlib + gsoap + ${JEMALLOC_LIB} + ${SCRIPT_LIB} + ${READLINE_LIBRARY} + ${TERMCAP_LIBRARY} + ${ACE_LIBRARY} + ${MYSQL_LIBRARY} + ${OPENSSL_LIBRARIES} + ${OPENSSL_EXTRA_LIBRARIES} + ${ZLIB_LIBRARIES} + ${OSX_LIBS} +) if( WIN32 ) add_custom_command(TARGET worldserver diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt index 30d6c4fcbe6..fa80c7ff3ca 100644 --- a/src/tools/map_extractor/CMakeLists.txt +++ b/src/tools/map_extractor/CMakeLists.txt @@ -32,19 +32,11 @@ add_executable(mapextractor ${sources} ) -if(WIN32) - target_link_libraries(mapextractor - bzip2 - zlib - mpq - ) -else() - target_link_libraries(mapextractor - ${BZIP2_LIBRARIES} - ${ZLIB_LIBRARIES} - mpq - ) -endif() +target_link_libraries(mapextractor + ${BZIP2_LIBRARIES} + ${ZLIB_LIBRARIES} + mpq +) add_dependencies(mapextractor mpq) diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt index 5d764e17a64..34075b5b97b 100644 --- a/src/tools/vmap3_assembler/CMakeLists.txt +++ b/src/tools/vmap3_assembler/CMakeLists.txt @@ -25,19 +25,11 @@ add_executable(vmap3assembler VMapAssembler.cpp) add_dependencies(vmap3assembler mpq) -if(WIN32) - target_link_libraries(vmap3assembler - collision - g3dlib - zlib - ) -else() - target_link_libraries(vmap3assembler - collision - g3dlib - ${ZLIB_LIBRARIES} - ) -endif() +target_link_libraries(vmap3assembler + collision + g3dlib + ${ZLIB_LIBRARIES} +) if( UNIX ) install(TARGETS vmap3assembler DESTINATION bin) diff --git a/src/tools/vmap3_extractor/CMakeLists.txt b/src/tools/vmap3_extractor/CMakeLists.txt index 06db26a23a0..ac15a6ae35c 100644 --- a/src/tools/vmap3_extractor/CMakeLists.txt +++ b/src/tools/vmap3_extractor/CMakeLists.txt @@ -33,19 +33,11 @@ endif() add_executable(vmap3extractor ${sources}) -if(WIN32) - target_link_libraries(vmap3extractor - bzip2 - zlib - mpq - ) -else() - target_link_libraries(vmap3extractor - ${BZIP2_LIBRARIES} - ${ZLIB_LIBRARIES} - mpq - ) -endif() +target_link_libraries(vmap3extractor + ${BZIP2_LIBRARIES} + ${ZLIB_LIBRARIES} + mpq +) add_dependencies(vmap3extractor mpq) |