diff options
| author | Shauren <shauren.trinity@gmail.com> | 2017-07-19 21:37:42 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2017-12-13 13:41:47 +0100 |
| commit | 57c13c539b91ff939bb600f6902c29f640289057 (patch) | |
| tree | 062322b6bf8487b78ec3ad3ed447a238ed96070f /src | |
| parent | e19bb7a1a5e2ee7881cd9637f46e97982d5f7560 (diff) | |
Buildsystem: Fixed windows pch build with ninja
(cherry picked from commit a6e46c1c2ef491cd4cce39be47445e9da194e84e)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/authserver/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/authserver/CMakeLists.txt b/src/server/authserver/CMakeLists.txt index d1320995b98..206749b702f 100644 --- a/src/server/authserver/CMakeLists.txt +++ b/src/server/authserver/CMakeLists.txt @@ -65,7 +65,7 @@ set_target_properties(authserver "server") if( WIN32 ) - if ( MSVC ) + if ( "${CMAKE_MAKE_PROGRAM}" MATCHES "MSBuild" ) add_custom_command(TARGET authserver POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/authserver.conf.dist ${CMAKE_BINARY_DIR}/bin/$(ConfigurationName)/ diff --git a/src/server/database/PrecompiledHeaders/databasePCH.cpp b/src/server/database/PrecompiledHeaders/databasePCH.cpp index 8ac9a9d0bd3..afc3186b656 100644 --- a/src/server/database/PrecompiledHeaders/databasePCH.cpp +++ b/src/server/database/PrecompiledHeaders/databasePCH.cpp @@ -15,4 +15,4 @@ * with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "PrecompiledHeaders/databasePCH.h" +#include "databasePCH.h" diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index 002f2a8e526..94ab5e480f3 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -77,7 +77,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)/ |