diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-08 17:16:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-10-08 17:18:39 (GMT) |
| commit | 340d0897fa9dfc568782d72c221ea6186bf533a6 (patch) | |
| tree | e38298e5867b28407b282424da94c18438a9b4e2 /Tests/Module | |
| parent | 5fdf75947822bc17d30a9e60022a4fc77b4cdf63 (diff) | |
| download | CMake-340d0897fa9dfc568782d72c221ea6186bf533a6.zip CMake-340d0897fa9dfc568782d72c221ea6186bf533a6.tar.gz CMake-340d0897fa9dfc568782d72c221ea6186bf533a6.tar.bz2 | |
Revert topic 'compiler-features-solaris'
Revert commit v3.4.0-rc1~10^2~2 (Features: Disable support for Oracle
SolarisStudio on non-Linux, 2015-09-29) and two follow-up commits.
The support of compile features and language standards on Orcale
SolarisStudio needs more investigation so for CMake 3.4 we should
just act as 3.3 did.
Diffstat (limited to 'Tests/Module')
| -rw-r--r-- | Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt index ffee035..c538280 100644 --- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt +++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt @@ -25,8 +25,7 @@ if (NOT CMAKE_CXX_COMPILE_FEATURES AND NOT CMAKE_C_COMPILE_FEATURES) ) add_executable(WriteCompilerDetectionHeader "${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp") - if((UNIX OR NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU") - AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "SunPro") + if(UNIX OR NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU") include(CheckCXXSourceCompiles) check_cxx_source_compiles("#include \"${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h\"\nint main() { return 0; }\n" file_include_works |