From f99cba75d14fd1643dc11e8e23c77d5c81c56276 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Thu, 8 Dec 2016 22:31:00 +0100 Subject: [PATCH] Enable multiprocessor compilation on windows --- companion/src/CMakeLists.txt | 2 +- radio/src/CMakeLists.txt | 2 +- radio/src/targets/simu/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/companion/src/CMakeLists.txt b/companion/src/CMakeLists.txt index f411c9691..1dd2a20b6 100644 --- a/companion/src/CMakeLists.txt +++ b/companion/src/CMakeLists.txt @@ -55,7 +55,7 @@ endif() add_definitions(-DQXT_STATIC) if(MSVC) - set(CMAKE_CXX_FLAGS "/EHsc /LD") + set(CMAKE_CXX_FLAGS "/EHsc /LD /MP") SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,5.01") include_directories(${PROJECT_SOURCE_DIR}/winbuild C:/Programs/pthreads/Pre-built.2/include C:/Programs/msinttypes C:/Programs/dirent/include) link_directories(C:/Programs/pthreads/Pre-built.2/lib/) diff --git a/radio/src/CMakeLists.txt b/radio/src/CMakeLists.txt index 0d6f1a2d9..d223ae2c1 100644 --- a/radio/src/CMakeLists.txt +++ b/radio/src/CMakeLists.txt @@ -411,7 +411,7 @@ if(NOT MSVC) else() set(CMAKE_C_COMPILER avr-gcc) set(CMAKE_CXX_COMPILER avr-gcc) - set(CMAKE_CXX_FLAGS "-mmcu=${MCU} -DF_CPU=16000000UL -O${OPT} -gdwarf-2 -fno-exceptions -flto -fwhole-program -fno-inline-small-functions -mstrict-X ${WARNING_FLAGS}") + set(CMAKE_CXX_FLAGS "-mmcu=${MCU} -DF_CPU=16000000UL -O${OPT} -gdwarf-2 -fno-exceptions -flto -fwhole-program -fno-inline-small-functions -mstrict-X ${WARNING_FLAGS} /MP") # Remove once the minimum cmake version is set to 3.1 in the main CmakeLists.tx if (${CMAKE_VERSION} VERSION_LESS 3.1.0}) diff --git a/radio/src/targets/simu/CMakeLists.txt b/radio/src/targets/simu/CMakeLists.txt index 2ab7bb450..3984229d0 100644 --- a/radio/src/targets/simu/CMakeLists.txt +++ b/radio/src/targets/simu/CMakeLists.txt @@ -39,7 +39,7 @@ if(Qt5Widgets_FOUND) endif() if(MSVC) - set(CMAKE_CXX_FLAGS "/EHsc /LD") + set(CMAKE_CXX_FLAGS "/EHsc /LD /MP") include_directories(${PROJECT_SOURCE_DIR}/winbuild C:/Programs/pthreads/Pre-built.2/include C:/Programs/msinttypes C:/Programs/dirent/include) target_link_libraries(${SIMULATOR_TARGET} PRIVATE C:/Programs/pthreads/Pre-built.2/lib/pthreadVC2.lib) else()