diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | cmake/macros/FindPCHSupport.cmake | 10 | ||||
| -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 |
5 files changed, 13 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index 2692f20cc01..9ef72e70bf3 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ nbproject/* .browse.VC* .vscode cmake-build-*/ +.vs diff --git a/cmake/macros/FindPCHSupport.cmake b/cmake/macros/FindPCHSupport.cmake index f58634bb407..3dcd81baa90 100644 --- a/cmake/macros/FindPCHSupport.cmake +++ b/cmake/macros/FindPCHSupport.cmake @@ -121,9 +121,17 @@ FUNCTION(ADD_CXX_PCH_MSVC TARGET_NAME_LIST PCH_HEADER PCH_SOURCE) GET_COMMON_PCH_PARAMS("${TARGET_NAME_LIST}" ${PCH_HEADER} "pch" "/I") FOREACH(TARGET_NAME ${TARGET_NAME_LIST}) + SET(PCH_COMPILE_FLAGS "/FI${PCH_HEADER_NAME} /Yu${PCH_HEADER_NAME}") + IF (NOT ${CMAKE_MAKE_PROGRAM} MATCHES "MSBuild") + SET(PCH_COMPILE_FLAGS "${PCH_COMPILE_FLAGS} /Fp${PCH_HEADER_OUT}") + SET(TARGET_SOURCES_LIST "") + GET_PROPERTY(TARGET_SOURCES_LIST TARGET ${TARGET_NAME} PROPERTY SOURCES) + LIST(REMOVE_ITEM TARGET_SOURCES_LIST ${PCH_SOURCE}) + SET_SOURCE_FILES_PROPERTIES(${TARGET_SOURCES_LIST} PROPERTIES OBJECT_DEPENDS "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${TARGET_NAME}.dir/${PCH_SOURCE}.obj") + ENDIF() SET_TARGET_PROPERTIES( ${TARGET_NAME} PROPERTIES - COMPILE_FLAGS "/FI${PCH_HEADER_NAME} /Yu${PCH_HEADER_NAME}" + COMPILE_FLAGS "${PCH_COMPILE_FLAGS}" ) ENDFOREACH() 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)/ |