From f8bb7afa9817411beda1f2492d18c61679e9a5f9 Mon Sep 17 00:00:00 2001
From: click <none@none>
Date: Wed, 30 Jun 2010 16:51:37 +0200
Subject: 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
---
 src/server/authserver/CMakeLists.txt     | 47 ++++++++++++++++----------------
 src/server/worldserver/CMakeLists.txt    | 11 ++++----
 src/tools/map_extractor/CMakeLists.txt   |  4 ++-
 src/tools/vmap3_assembler/CMakeLists.txt |  4 ++-
 src/tools/vmap3_extractor/CMakeLists.txt |  4 ++-
 5 files changed, 39 insertions(+), 31 deletions(-)

(limited to 'src')

diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 956010da987..e97bcfbea88 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -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()
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index 823cc720e56..17bdc418884 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -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()
diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt
index a18ee7cd517..cb3778c7c6a 100644
--- a/src/tools/map_extractor/CMakeLists.txt
+++ b/src/tools/map_extractor/CMakeLists.txt
@@ -33,4 +33,6 @@ else()
   )
 endif()
 
-install(TARGETS mapextractor DESTINATION bin)
+if( UNIX )
+  install(TARGETS mapextractor DESTINATION bin)
+endif()
diff --git a/src/tools/vmap3_assembler/CMakeLists.txt b/src/tools/vmap3_assembler/CMakeLists.txt
index 0b8ece2dc37..2035d3f2055 100644
--- a/src/tools/vmap3_assembler/CMakeLists.txt
+++ b/src/tools/vmap3_assembler/CMakeLists.txt
@@ -37,4 +37,6 @@ else()
   )
 endif()
 
-install(TARGETS vmap3assembler DESTINATION bin)
+if( UNIX )
+  install(TARGETS vmap3assembler DESTINATION bin)
+if()
diff --git a/src/tools/vmap3_extractor/CMakeLists.txt b/src/tools/vmap3_extractor/CMakeLists.txt
index 9dfdd545df8..62604f7ad3d 100755
--- a/src/tools/vmap3_extractor/CMakeLists.txt
+++ b/src/tools/vmap3_extractor/CMakeLists.txt
@@ -36,4 +36,6 @@ else()
   )
 endif()
 
-install(TARGETS vmap3extractor DESTINATION bin)
+if( UNIX )
+  install(TARGETS vmap3extractor DESTINATION bin)
+endif()
-- 
cgit v1.2.3