Buildsystem: Fixed windows pch build with ninja

This commit is contained in:
Shauren
2017-07-19 21:37:42 +02:00
parent 33478689bb
commit a6e46c1c2e
5 changed files with 13 additions and 4 deletions

1
.gitignore vendored
View File

@@ -21,3 +21,4 @@ nbproject/*
.browse.VC*
.vscode
cmake-build-*/
.vs

View File

@@ -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()

View File

@@ -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)/

View File

@@ -1 +1 @@
#include "PrecompiledHeaders/databasePCH.h"
#include "databasePCH.h"

View File

@@ -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)/