From 3b1bb703a2f75f26fd453e50f848b5dbd64bc169 Mon Sep 17 00:00:00 2001 From: KWSys Upstream Date: Fri, 8 Dec 2017 10:08:10 -0500 Subject: 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 --- CMakeLists.txt | 12 ++++++++---- 1 file 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 ) -- cgit v0.12