Buildsystem: Fixed windows pch build with ninja
(cherry picked from commit a6e46c1c2ef491cd4cce39be47445e9da194e84e)
This commit is contained in:
1 parent
47067814a1
commit
f7fd109066
5 files changed
+13
-4
No files matched your search
@@ -21,3 +21,4 @@ nbproject/*
|
|||||||
.browse.VC*
|
.browse.VC*
|
||||||
.vscode
|
.vscode
|
||||||
cmake-build-*/
|
cmake-build-*/
|
||||||
|
.vs
|
||||||
@@ -128,9 +128,17 @@ FUNCTION(ADD_CXX_PCH_MSVC TARGET_NAME_LIST PCH_HEADER PCH_SOURCE)
|
|||||||
GET_COMMON_PCH_PARAMS("${TARGET_NAME_LIST}" ${PCH_HEADER} "pch" "/I")
|
GET_COMMON_PCH_PARAMS("${TARGET_NAME_LIST}" ${PCH_HEADER} "pch" "/I")
|
||||||
|
|
||||||
FOREACH(TARGET_NAME ${TARGET_NAME_LIST})
|
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(
|
SET_TARGET_PROPERTIES(
|
||||||
${TARGET_NAME} PROPERTIES
|
${TARGET_NAME} PROPERTIES
|
||||||
COMPILE_FLAGS "/FI${PCH_HEADER_NAME} /Yu${PCH_HEADER_NAME}"
|
COMPILE_FLAGS "${PCH_COMPILE_FLAGS}"
|
||||||
)
|
)
|
||||||
ENDFOREACH()
|
ENDFOREACH()
|
||||||
|
|
||||||
|
|||||||
@@ -65,7 +65,7 @@ set_target_properties(authserver
|
|||||||
"server")
|
"server")
|
||||||
|
|
||||||
if( WIN32 )
|
if( WIN32 )
|
||||||
if ( MSVC )
|
if ( "${CMAKE_MAKE_PROGRAM}" MATCHES "MSBuild" )
|
||||||
add_custom_command(TARGET authserver
|
add_custom_command(TARGET authserver
|
||||||
POST_BUILD
|
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_BINARY_DIR}/bin/$(ConfigurationName)/
|
||||||
|
|||||||
@@ -15,4 +15,4 @@
|
|||||||
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
* with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "PrecompiledHeaders/databasePCH.h"
|
#include "databasePCH.h"
|
||||||
@@ -77,7 +77,7 @@ if (WORLDSERVER_DYNAMIC_SCRIPT_MODULES_DEPENDENCIES)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
if( WIN32 )
|
if( WIN32 )
|
||||||
if ( MSVC )
|
if ( "${CMAKE_MAKE_PROGRAM}" MATCHES "MSBuild" )
|
||||||
add_custom_command(TARGET worldserver
|
add_custom_command(TARGET worldserver
|
||||||
POST_BUILD
|
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_BINARY_DIR}/bin/$(ConfigurationName)/
|
||||||
|
|||||||
Reference in new issue
Block a user