diff options
| author | Shauren <shauren.trinity@gmail.com> | 2017-07-19 21:37:42 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-07-19 21:37:42 +0200 |
| commit | a6e46c1c2ef491cd4cce39be47445e9da194e84e (patch) | |
| tree | c646a2d886c1c38f6d0e006b99211396278adaca /src | |
| parent | 33478689bb1b8d135288fe76343c1ce16aed4bea (diff) | |
Buildsystem: Fixed windows pch build with ninja
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/bnetserver/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/server/database/PrecompiledHeaders/databasePCH.cpp | 2 | ||||
| -rw-r--r-- | src/server/worldserver/CMakeLists.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/server/bnetserver/CMakeLists.txt b/src/server/bnetserver/CMakeLists.txt index 0520bc9dca5..238f6bcaab6 100644 --- a/src/server/bnetserver/CMakeLists.txt +++ b/src/server/bnetserver/CMakeLists.txt @@ -65,7 +65,7 @@ set_target_properties(bnetserver "server") if (WIN32) - if (MSVC) + if ("${CMAKE_MAKE_PROGRAM}" MATCHES "MSBuild") add_custom_command(TARGET bnetserver POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/bnetserver.conf.dist ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/ diff --git a/src/server/database/PrecompiledHeaders/databasePCH.cpp b/src/server/database/PrecompiledHeaders/databasePCH.cpp index f84a52be82a..df8f31c3052 100644 --- a/src/server/database/PrecompiledHeaders/databasePCH.cpp +++ b/src/server/database/PrecompiledHeaders/databasePCH.cpp @@ -1 +1 @@ -#include "PrecompiledHeaders/databasePCH.h" +#include "databasePCH.h" diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index ad9ab568185..264c14178cd 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -76,7 +76,7 @@ if (WORLDSERVER_DYNAMIC_SCRIPT_MODULES_DEPENDENCIES) endif() if( WIN32 ) - if ( MSVC ) + if ( "${CMAKE_MAKE_PROGRAM}" MATCHES "MSBuild" ) add_custom_command(TARGET worldserver POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/worldserver.conf.dist ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/ |