diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-07 13:10:37 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-10-07 13:10:37 (GMT) |
| commit | 5553e330dc2015ec5b9f8e6573d9b58928bcb9e3 (patch) | |
| tree | dee8489b38397f89530f2e2340fcc28f4d2752dd | |
| parent | 8c61544bb7ea017158e37e78cbbdbc943931824d (diff) | |
| parent | 20e8dcf162b9963c9ff195525bc433df2bc2de2a (diff) | |
| download | CMake-5553e330dc2015ec5b9f8e6573d9b58928bcb9e3.zip CMake-5553e330dc2015ec5b9f8e6573d9b58928bcb9e3.tar.gz CMake-5553e330dc2015ec5b9f8e6573d9b58928bcb9e3.tar.bz2 | |
Merge topic 'check-libuv-minimum-version'
20e8dcf1 Set minimum version for LibUV to 1.0.0
845b98f4 Use find_package for JsonCpp and LibUV instead of include
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 309e224..b4a577c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,10 @@ if(POLICY CMP0053) endif() project(CMake) +# Make sure we can find internal find_package modules only used for +# building CMake and not for shipping externally +list(INSERT CMAKE_MODULE_PATH 0 ${CMake_SOURCE_DIR}/Source/Modules) + if(CMAKE_BOOTSTRAP) # Running from bootstrap script. Set local variable and remove from cache. set(CMAKE_BOOTSTRAP 1) @@ -441,7 +445,7 @@ macro (CMAKE_BUILD_UTILITIES) # Build jsoncpp library. if(CMAKE_USE_SYSTEM_JSONCPP) if(NOT CMAKE_VERSION VERSION_LESS 3.0) - include(${CMake_SOURCE_DIR}/Source/Modules/FindJsonCpp.cmake) + find_package(JsonCpp) else() message(FATAL_ERROR "CMAKE_USE_SYSTEM_JSONCPP requires CMake >= 3.0") endif() @@ -487,7 +491,7 @@ int main(void) { return 0; } if(CMAKE_USE_LIBUV) if(CMAKE_USE_SYSTEM_LIBUV) if(NOT CMAKE_VERSION VERSION_LESS 3.0) - include(${CMake_SOURCE_DIR}/Source/Modules/FindLibUV.cmake) + find_package(LibUV 1.0.0) else() message(FATAL_ERROR "CMAKE_USE_SYSTEM_LIBUV requires CMake >= 3.0") endif() |