diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-07 13:08:27 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-07 13:08:27 (GMT) |
| commit | d231f3b738b31ebad075c49abcef972c268ba9d0 (patch) | |
| tree | ed45558528408a67a4971e57799a559970265090 | |
| parent | fbc1a30b87f9af2f798e1f2dc61e94089a99e213 (diff) | |
| parent | 20e8dcf162b9963c9ff195525bc433df2bc2de2a (diff) | |
| download | CMake-d231f3b738b31ebad075c49abcef972c268ba9d0.zip CMake-d231f3b738b31ebad075c49abcef972c268ba9d0.tar.gz CMake-d231f3b738b31ebad075c49abcef972c268ba9d0.tar.bz2 | |
Merge branch 'check-libuv-minimum-version' into release
| -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() |