And even more CMake-specific cleanups (mutes most of the "non-harmful" warnings - VS is just trying to be too friendly/noisy at times)

--HG--
branch : trunk
This commit is contained in:
click
2010-06-30 16:51:37 +02:00
parent fc1ed4b109
commit f8bb7afa98
7 changed files with 96 additions and 54 deletions
+24 -23
View File
@@ -57,29 +57,30 @@ endif()
set_target_properties(authserver PROPERTIES LINK_FLAGS "${authserver_LINK_FLAGS}")
if(WIN32)
target_link_libraries(
authserver
shared
trinitydatabase
trinityauth
trinityconfig
${MYSQL_LIBRARY}
${OPENSSL_LIBRARIES}
${OPENSSL_EXTRA_LIBRARIES}
)
target_link_libraries(
authserver
shared
trinitydatabase
trinityauth
trinityconfig
${MYSQL_LIBRARY}
${OPENSSL_LIBRARIES}
${OPENSSL_EXTRA_LIBRARIES}
)
else()
target_link_libraries(
authserver
shared
trinitydatabase
trinityauth
trinityconfig
${MYSQL_LIBRARY}
${OPENSSL_LIBRARIES}
${OSX_LIBS}
)
target_link_libraries(
authserver
shared
trinitydatabase
trinityauth
trinityconfig
${MYSQL_LIBRARY}
${OPENSSL_LIBRARIES}
${OSX_LIBS}
)
endif()
########### install files ###############
install(TARGETS authserver DESTINATION bin)
install(FILES authserver.conf.dist DESTINATION etc)
if( UNIX )
install(TARGETS authserver DESTINATION bin)
install(FILES authserver.conf.dist DESTINATION etc)
endif()
+6 -5
View File
@@ -140,8 +140,9 @@ if(DO_SCRIPTS)
else(DO_SCRIPTS)
set(SCRIPT_LIB "")
endif(DO_SCRIPTS)
if(WIN32)
target_link_libraries(
target_link_libraries(
worldserver
game
shared
@@ -181,7 +182,7 @@ else()
)
endif()
########### install files ###############
install(TARGETS worldserver DESTINATION bin)
install(FILES worldserver.conf.dist DESTINATION etc)
if( UNIX )
install(TARGETS worldserver DESTINATION bin)
install(FILES worldserver.conf.dist DESTINATION etc)
endif()