diff options
| author | Brian Munro <brian.alexander.munro@gmail.com> | 2018-04-13 11:56:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-13 11:56:36 +0200 |
| commit | bc75009169ecbf378fa90891dc8183a8cb3ef499 (patch) | |
| tree | 221f74cbaeea3750bd705a6a37ff8242e4cef192 /CMakeLists.txt | |
| parent | d6aab781ee1d5b927ccf06100e74539a980ee83f (diff) | |
| parent | 8be73d2e3b0af9cb99616d31418a0d9c74aca466 (diff) | |
Merge pull request #294 from Modorganizer2/Develop
Release 2.1.2
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9c6351f7..0c5f58a7 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($<$<CXX_COMPILER_ID:MSVC>:/MP>) PROJECT(organizer) @@ -8,7 +10,6 @@ set_property(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" PROPERTY VS_STARTUP_PROJECT 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) +LIST(APPEND CMAKE_PREFIX_PATH ${LZ4_ROOT}/dll) ADD_SUBDIRECTORY(src) |