diff --git a/CMakeLists.txt b/CMakeLists.txt index 2943dce..df660db 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) @@ -9,7 +11,4 @@ SET(DEPENDENCIES_DIR CACHE PATH "") # hint to find qt in dependencies path LIST(APPEND CMAKE_PREFIX_PATH ${QT_ROOT}/lib/cmake) -FILE(GLOB_RECURSE BOOST_ROOT ${DEPENDENCIES_DIR}/boost*/project-config.jam) -GET_FILENAME_COMPONENT(BOOST_ROOT ${BOOST_ROOT} DIRECTORY) - ADD_SUBDIRECTORY(src) \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4178b51..b65c4d5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -CMAKE_MINIMUM_REQUIRED (VERSION 2.8) +CMAKE_MINIMUM_REQUIRED (VERSION 2.8.11) CMAKE_POLICY(SET CMP0020 NEW) CMAKE_POLICY(SET CMP0043 NEW) @@ -54,11 +54,10 @@ IF (NOT "${OPTIMIZE_LINK_FLAGS}" STREQUAL "") SET_TARGET_PROPERTIES(${PROJ_NAME} PROPERTIES LINK_FLAGS_RELWITHDEBINFO ${OPTIMIZE_LINK_FLAGS}) ENDIF() -QT5_USE_MODULES(${PROJ_NAME} Widgets) - ############### ## Installation INSTALL(TARGETS ${PROJ_NAME} RUNTIME DESTINATION bin/plugins) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJ_NAME}.pdb DESTINATION pdb) +INSTALL(FILES $ + DESTINATION pdb)