diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-02 14:56:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-02 14:56:52 (GMT) |
| commit | 7555babbcf4b2b68bdfe99649be3b6076230518b (patch) | |
| tree | d906c055fa2635051c72a07a3a1dd910948c7521 /Tests | |
| parent | 9b5554cda122e8be179cbc2bbe9ed82ed26b20b0 (diff) | |
| parent | 5fdf75947822bc17d30a9e60022a4fc77b4cdf63 (diff) | |
| download | CMake-7555babbcf4b2b68bdfe99649be3b6076230518b.zip CMake-7555babbcf4b2b68bdfe99649be3b6076230518b.tar.gz CMake-7555babbcf4b2b68bdfe99649be3b6076230518b.tar.bz2 | |
Merge topic 'compiler-features-solaris'
5fdf7594 Tests: Suppress WriteCompilerDetectionHeader failure on SunPro
c824b23d Features: Fix C++98 flags on Oracle SolarisStudio 12.4 on Linux
61bc0f73 Features: Disable support for Oracle SolarisStudio on non-Linux
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt index c538280..ffee035 100644 --- a/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt +++ b/Tests/Module/WriteCompilerDetectionHeader/CMakeLists.txt @@ -25,7 +25,8 @@ 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") + if((UNIX OR NOT CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + AND NOT CMAKE_CXX_COMPILER_ID STREQUAL "SunPro") include(CheckCXXSourceCompiles) check_cxx_source_compiles("#include \"${CMAKE_CURRENT_BINARY_DIR}/test_compiler_detection.h\"\nint main() { return 0; }\n" file_include_works |