forked from Mirrors/openclonk
cmake: Always use multiproc build in MSVC
Multicore processors have become the norm, and the minimal rebuild setting only works on i386 anyway.stable-5.4
parent
b6a01b62aa
commit
9e18ca3c9f
|
@ -70,9 +70,11 @@ else()
|
||||||
SET(INITIAL_USE_OPEN_AL OFF)
|
SET(INITIAL_USE_OPEN_AL OFF)
|
||||||
endif()
|
endif()
|
||||||
option(USE_OPEN_AL "Use OpenAL to play sounds" ${INITIAL_USE_OPEN_AL})
|
option(USE_OPEN_AL "Use OpenAL to play sounds" ${INITIAL_USE_OPEN_AL})
|
||||||
option(OC_BUILD_MULTIPROCESSOR "Use all processor cores to build" OFF)
|
|
||||||
option(WITH_AUTOMATIC_UPDATE "Automatic updates are downloaded from the project website." OFF)
|
option(WITH_AUTOMATIC_UPDATE "Automatic updates are downloaded from the project website." OFF)
|
||||||
|
|
||||||
|
# Remove obsolete options
|
||||||
|
unset(OC_BUILD_MULTIPROCESSOR CACHE)
|
||||||
|
|
||||||
############################################################################
|
############################################################################
|
||||||
# Check for compiler quirks and features
|
# Check for compiler quirks and features
|
||||||
############################################################################
|
############################################################################
|
||||||
|
@ -105,14 +107,9 @@ CHECK_CXX_SOURCE_COMPILES("int main() { static_assert(true, \"\"); }" HAVE_STATI
|
||||||
set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}")
|
set(CMAKE_REQUIRED_FLAGS "${SAFE_CMAKE_REQUIRED_FLAGS}")
|
||||||
|
|
||||||
if(MSVC_VERSION GREATER 1499)
|
if(MSVC_VERSION GREATER 1499)
|
||||||
# Activate minimal rebuild
|
|
||||||
if(OC_BUILD_MULTIPROCESSOR)
|
|
||||||
list(APPEND OC_CXX_FLAGS /MP)
|
list(APPEND OC_CXX_FLAGS /MP)
|
||||||
list(REMOVE_ITEM OC_CXX_FLAGS_DEBUG /Gm)
|
list(REMOVE_ITEM OC_CXX_FLAGS_DEBUG /Gm)
|
||||||
else()
|
|
||||||
list(REMOVE_ITEM OC_CXX_FLAGS /MP)
|
|
||||||
list(APPEND OC_CXX_FLAGS_DEBUG /Gm)
|
|
||||||
endif()
|
|
||||||
if (NOT CMAKE_CL_64)
|
if (NOT CMAKE_CL_64)
|
||||||
# Activate edit-and-continue
|
# Activate edit-and-continue
|
||||||
list(REMOVE_ITEM OC_CXX_FLAGS_DEBUG /Zi)
|
list(REMOVE_ITEM OC_CXX_FLAGS_DEBUG /Zi)
|
||||||
|
|
Loading…
Reference in New Issue