diff options
| author | KWSys Upstream <kwrobot@kitware.com> | 2017-12-08 15:08:10 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-12-08 15:08:38 (GMT) |
| commit | 3b1bb703a2f75f26fd453e50f848b5dbd64bc169 (patch) | |
| tree | 47d46e0dc306e5a70d38a874da9eeb1297de62f8 | |
| parent | 5b1c84b449cbe84e429c968dd450673203493d5b (diff) | |
| download | CMake-3b1bb703a2f75f26fd453e50f848b5dbd64bc169.zip CMake-3b1bb703a2f75f26fd453e50f848b5dbd64bc169.tar.gz CMake-3b1bb703a2f75f26fd453e50f848b5dbd64bc169.tar.bz2 | |
KWSys 2017-12-08 (2d27b1d0)
Code extracted from:
https://gitlab.kitware.com/utils/kwsys.git
at commit 2d27b1d075d93860ee63564f635fd1710aa61208 (master).
Upstream Shortlog
-----------------
Brad King (1):
9995f700 hashtable: Drop when building inside CMake
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 64b6484..351e38d 100644 --- a/CMakeLists.txt +++ b/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 ) |