diff options
| author | Brad King <brad.king@kitware.com> | 2014-07-14 13:37:49 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-07-14 13:37:49 (GMT) |
| commit | 27fb86d72e254802e595f9e9fb1df10cf15fcf03 (patch) | |
| tree | 7b6bf501e25b1eba5b6a2b3393a27f6b326e7916 | |
| parent | edf94b6588ceba9196a1b5ef3a4579114bebab39 (diff) | |
| parent | 38d3fe0785e7691d19d015b43d2bb9d6d17bbd1f (diff) | |
| download | CMake-27fb86d72e254802e595f9e9fb1df10cf15fcf03.zip CMake-27fb86d72e254802e595f9e9fb1df10cf15fcf03.tar.gz CMake-27fb86d72e254802e595f9e9fb1df10cf15fcf03.tar.bz2 | |
Merge topic 'build-KWIML-always'
38d3fe07 Tests: Build and test KWIML even when testing an external CMake
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 41ff4a6..e210f74 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -201,12 +201,6 @@ endmacro() #----------------------------------------------------------------------- macro (CMAKE_BUILD_UTILITIES) #--------------------------------------------------------------------- - # Create the KWIML library for CMake. - set(KWIML cmIML) - set(KWIML_HEADER_ROOT ${CMake_BINARY_DIR}/Utilities) - add_subdirectory(Utilities/KWIML) - - #--------------------------------------------------------------------- # Create the kwsys library for CMake. set(KWSYS_NAMESPACE cmsys) set(KWSYS_USE_SystemTools 1) @@ -465,6 +459,11 @@ if("x${CMAKE_TESTS_CDASH_SERVER}" STREQUAL "x") set(CMAKE_TESTS_CDASH_SERVER "http://open.cdash.org") endif() +# Create the KWIML library for CMake. +set(KWIML cmIML) +set(KWIML_HEADER_ROOT ${CMake_BINARY_DIR}/Utilities) +add_subdirectory(Utilities/KWIML) + if(NOT CMake_TEST_EXTERNAL_CMAKE) # build the utilities (a macro defined in this file) CMAKE_BUILD_UTILITIES() |