diff options
| author | Brad King <brad.king@kitware.com> | 2017-12-11 13:33:19 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-12-11 13:33:25 (GMT) |
| commit | 1efb6e566fd2d35fc744559efad095dbef8cf0c6 (patch) | |
| tree | dbaaac83ad34739afc942cc78596e3415e5e0868 /Source | |
| parent | 14fe6d431b12139ea2aeb5bcc09efd0f964597aa (diff) | |
| parent | 9dee52bacad3a5b3794b0101b7b16d6bc9b0553a (diff) | |
| download | CMake-1efb6e566fd2d35fc744559efad095dbef8cf0c6.zip CMake-1efb6e566fd2d35fc744559efad095dbef8cf0c6.tar.gz CMake-1efb6e566fd2d35fc744559efad095dbef8cf0c6.tar.bz2 | |
Merge topic 'update-kwsys'
9dee52ba Merge branch 'upstream-KWSys' into update-kwsys
3b1bb703 KWSys 2017-12-08 (2d27b1d0)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1576
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/kwsys/CMakeLists.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index 64b6484..351e38d 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -705,9 +705,13 @@ ENDIF() # selected components. Initialize with required components. SET(KWSYS_CLASSES) SET(KWSYS_H_FILES Configure SharedForward) -SET(KWSYS_HXX_FILES Configure String - hashtable hash_fun hash_map hash_set - ) +SET(KWSYS_HXX_FILES Configure String) + +IF(NOT CMake_SOURCE_DIR) + SET(KWSYS_HXX_FILES ${KWSYS_HXX_FILES} + hashtable hash_fun hash_map hash_set + ) +ENDIF() # Add selected C++ classes. SET(cppclasses @@ -1027,7 +1031,7 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) ENDFOREACH() # C++ tests - IF(NOT WATCOM) + IF(NOT WATCOM AND NOT CMake_SOURCE_DIR) SET(KWSYS_CXX_TESTS testHashSTL ) |