Skip to content
Snippets Groups Projects
Commit 2d27b1d0 authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'no-hashtable-for-cmake'


9995f700 hashtable: Drop when building inside CMake

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !76
parents 4aee0036 9995f700
No related branches found
No related tags found
No related merge requests found
......@@ -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
)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment