Buildsystem/Windows: Use CMAKE_INSTALL_PREFIX as result-dir for output (Thanks to Paradox)

(Suggested change for genrevisions default path retained to avoid breaking earlier builds, and it's not really a "server binary")
Fixes issue 3366

--HG--
branch : trunk

4 files changed, 55 insertions, 38 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86e51747b8e..d199a70ec5a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,6 @@ include(cmake/FindOpenSSL.cmake)
 
 if( UNIX )
   include(cmake/FindReadline.cmake)
-  include(cmake/FindTermcap.cmake)
   include(FindZLIB)
   include(FindBZip2)
 endif()
@@ -101,9 +100,18 @@ endif()
 #
 
 if( PREFIX )
-  set(CMAKE_INSTALL_PREFIX ${PREFIX})
+  set(CMAKE_INSTALL_PREFIX "${PREFIX}")
 endif()
 
+IF(WIN32)
+   IF(NOT CYGWIN)
+     IF(NOT CMAKE_INSTALL_PREFIX)
+       SET(CMAKE_INSTALL_PREFIX
+           "${CMAKE_BINARY_DIR}/bin")
+     ENDIF(NOT CMAKE_INSTALL_PREFIX)
+   ENDIF(NOT CYGWIN)
+ENDIF(WIN32)
+
 #
 # Handle debugmode compiles (this will require further work for proper WIN32-setups)
 #
@@ -117,10 +125,10 @@ endif()
 #
 
 if( MSVC )
-  # Set up MSVC to dump binaries in the <builddir>/bin/<buildtype>/ folder
-  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+  # Set up MSVC to dump binaries into the installation-folder
+  set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_INSTALL_PREFIX})
+  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_INSTALL_PREFIX})
+  set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_INSTALL_PREFIX})
 endif()
 
 #
@@ -161,73 +169,72 @@ execute_process(
 #
 
 message("")
-message("* TrinityCore revision  : ${HG_REVISION}")
-message("* Build binaries in     : ${CMAKE_BUILD_TYPE} mode")
+message("* TrinityCore revision      : ${HG_REVISION}")
 message("")
 
 #
 # Output information about installation-directories and locations
 #
 
+message("* Install core to           : ${CMAKE_INSTALL_PREFIX}")
 if( UNIX )
-  message("* Install core to       : ${CMAKE_INSTALL_PREFIX}")
-  message("* Install libraries to  : ${LIBSDIR}")
-  message("* Install configs to    : ${CONF_DIR}")
-  message("")
+  message("* Install libraries to      : ${LIBSDIR}")
+  message("* Install configs to        : ${CONF_DIR}")
 endif()
+message("")
 
 #
 # Show infomation about the options selected during configuration
 #
 
 if( SERVERS )
-  message("* Build servers         : Yes (default)")
+  message("* Build core                : Yes (default)")
+else()
+  message("* Build core                : No")
+endif()
+
+if( GAMEPCH )
+  message("* Build core with PCH       : Yes (default)")
 else()
-  message("* Build servers         : No")
+  message("* Build core with PCH       : No")
 endif()
 
 if( SCRIPTS )
-  message("* Build with scripts    : Yes (default)")
   add_definitions(-DSCRIPTS)
+  message("* Build scripts             : Yes (default)")
+else()
+  set(SCRIPTPCH 0)
+  message("* Build scripts             : No")
+endif()
+
+if( SCRIPTPCH )
+  message("* Build scripts with PCH    : Yes (default)")
 else()
-  message("* Build with scripts    : No")
+  message("* Build scripts with PCH    : No")
 endif()
 
 if( TOOLS )
-  message("* Build map/vmap tools  : Yes")
+  message("* Build map/vmap tools      : Yes")
 else()
-  message("* Build map/vmap tools  : No  (default)")
+  message("* Build map/vmap tools      : No  (default)")
 endif()
 
 if( DEBUG )
-  message("* Build in debug-mode   : Yes")
   add_definitions(-DTRINITY_DEBUG)
   if(CMAKE_COMPILER_IS_GNUCXX)
     add_definitions(-g)
   endif()
+  message("* Build with coreside debug : Yes")
 else()
-  message("* Build in debug-mode   : No  (default)")
-endif()
-
-if( GAMEPCH )
-  message("* Build game w/PCH      : Yes (default)")
-else()
-  message("* Build game w/PCH      : No")
-endif()
-
-if( SCRIPTPCH )
-  message("* Build scripts w/PCH   : Yes (default)")
-else()
-  message("* Build scripts w/PCH   : No")
+  message("* Build with coreside debug : No  (default)")
 endif()
 
 if( WARNINGS )
-  message("* Show all warnings     : Yes")
   if( UNIX )
     add_definitions(-Wall -Wfatal-errors -Wextra)
   endif()
+  message("* Show all warnings         : Yes")
 else()
-  message("* Show compile-warnings : No  (default)")
   if( UNIX )
     add_definitions(--no-warnings) # makes build look nice, no warnings shown at all, only errors
   elseif( WIN32 )
@@ -238,6 +245,7 @@ else()
     endif()
     add_definitions(-D_CRT_SECURE_NO_WARNINGS)
   endif()
+  message("* Show compile-warnings     : No  (default)")
 endif()
 
 #
@@ -245,10 +253,13 @@ endif()
 #
 
 if( SQL )
-  message("* Install SQL-files     : Yes")
+  message("* Install SQL-files         : Yes")
 else()
-  message("* Install SQL-files     : No  (default)")
+  message("* Install SQL-files         : No  (default)")
 endif()
+
+message("")
+message(STATUS "Report errors to our issuetracker, and remember to include this output")
 message("")
 
 #####
diff --git a/PreLoad.cmake b/PreLoad.cmake
new file mode 100644
index 00000000000..bd6f0396584
--- /dev/null
+++ b/PreLoad.cmake
@@ -0,0 +1,6 @@
+IF(WIN32)
+   IF(NOT CYGWIN)
+     SET(CMAKE_INSTALL_PREFIX
+         "" CACHE PATH "Default install path")
+   ENDIF(NOT CYGWIN)
+ENDIF(WIN32)
diff --git a/src/server/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt
index 9af38dd89f6..f352902ffb9 100644
--- a/src/server/authserver/CMakeLists.txt
+++ b/src/server/authserver/CMakeLists.txt
@@ -90,7 +90,7 @@ endif()
 if( WIN32 )
   add_custom_command(TARGET authserver
     POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/authserver.conf.dist ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/authserver.conf.dist ${CMAKE_INSTALL_PREFIX}/$(ConfigurationName)/
   )
 endif()
 
diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt
index d73a25f2354..8869f5faca2 100644
--- a/src/server/worldserver/CMakeLists.txt
+++ b/src/server/worldserver/CMakeLists.txt
@@ -194,7 +194,7 @@ endif()
 if( WIN32 )
   add_custom_command(TARGET worldserver
     POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/worldserver.conf.dist ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/worldserver.conf.dist ${CMAKE_INSTALL_PREFIX}/$(ConfigurationName)/
   )
 endif()