diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-31 13:55:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-08-31 13:55:01 (GMT) |
| commit | 49d293a795c42c0325aa677d6a7c0f55c647da91 (patch) | |
| tree | 4fd9904c8c03be327f754589d910d36c24ffcf10 /Source/kwsys/CMakeLists.txt | |
| parent | 51d7a7bb3f03b3562c8ca82ddfefcc5185dc2455 (diff) | |
| parent | ca96be228345d93f51cb4edbd0428b709f529b84 (diff) | |
| download | CMake-49d293a795c42c0325aa677d6a7c0f55c647da91.zip CMake-49d293a795c42c0325aa677d6a7c0f55c647da91.tar.gz CMake-49d293a795c42c0325aa677d6a7c0f55c647da91.tar.bz2 | |
Merge branch 'upstream-kwsys' into update-kwsys
Diffstat (limited to 'Source/kwsys/CMakeLists.txt')
| -rw-r--r-- | Source/kwsys/CMakeLists.txt | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index 017d619..c1229ff 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -91,6 +91,7 @@ ENDIF() IF(POLICY CMP0056) CMAKE_POLICY(SET CMP0056 NEW) ENDIF() +SET(CMAKE_LEGACY_CYGWIN_WIN32 0) #----------------------------------------------------------------------------- # If a namespace is not specified, use "kwsys" and enable testing. @@ -311,6 +312,15 @@ IF(NOT CMAKE_COMPILER_IS_GNUCXX) ENDIF() ENDIF() ENDIF() +IF(KWSYS_STANDALONE) + IF(CMAKE_CXX_COMPILER_ID STREQUAL SunPro) + IF(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.13) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++03") + ELSE() + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -library=stlport4") + ENDIF() + ENDIF() +ENDIF() #----------------------------------------------------------------------------- # Configure Large File Support. @@ -1071,7 +1081,7 @@ IF(KWSYS_ENABLE_C AND KWSYS_C_SRCS) # Apply user-defined target properties to the library. IF(KWSYS_PROPERTIES_C) - SET_TARGET_PROPERTIES(${KWSYS_NAMESPACE} PROPERTIES + SET_TARGET_PROPERTIES(${KWSYS_NAMESPACE}_c PROPERTIES ${KWSYS_PROPERTIES_C} ) ENDIF() |