From 9c1fb3cb212808f11748a307faa05f287c1cf3fa Mon Sep 17 00:00:00 2001 From: Silarn Date: Sat, 7 Apr 2018 17:12:13 -0500 Subject: [PATCH] Fix up CMAKE to use /MP and allow building through umbrella --- CMakeLists.txt | 4 +++- src/CMakeLists.txt | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2943dce..93dbd0d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,6 @@ -CMAKE_MINIMUM_REQUIRED(VERSION 2.8) +CMAKE_MINIMUM_REQUIRED(VERSION 2.8.12) + +ADD_COMPILE_OPTIONS($<$:/MP>) SET(PROJ_NAME installer_bundle) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4178b51..a6872c8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -61,4 +61,5 @@ QT5_USE_MODULES(${PROJ_NAME} Widgets) INSTALL(TARGETS ${PROJ_NAME} RUNTIME DESTINATION bin/plugins) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJ_NAME}.pdb DESTINATION pdb) +INSTALL(FILES $ + DESTINATION pdb)