Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys: KWSys 2017-12-08 (2d27b1d0)
This commit is contained in:
commit
9dee52baca
@ -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
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user