diff options
| author | Stephen Kelly <steveire@gmail.com> | 2015-01-17 13:08:47 (GMT) |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2015-01-17 13:48:27 (GMT) |
| commit | 7dcdfec97fdefa90bded7868a638277d7c9903f1 (patch) | |
| tree | 96a1f7ec60608f93f29f8b9f5d9bce0fece6af21 | |
| parent | 8b7db43bc694c2b89b1309fc875bbdb907a90ceb (diff) | |
| download | CMake-7dcdfec97fdefa90bded7868a638277d7c9903f1.zip CMake-7dcdfec97fdefa90bded7868a638277d7c9903f1.tar.gz CMake-7dcdfec97fdefa90bded7868a638277d7c9903f1.tar.bz2 | |
WCDH: Find a language-specific DetermineCompiler.cmake if present.
The SolarisStudio compiler module uses language specific files.
| -rw-r--r-- | Modules/WriteCompilerDetectionHeader.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/WriteCompilerDetectionHeader.cmake b/Modules/WriteCompilerDetectionHeader.cmake index d61358f..0464e66 100644 --- a/Modules/WriteCompilerDetectionHeader.cmake +++ b/Modules/WriteCompilerDetectionHeader.cmake @@ -234,7 +234,11 @@ function(_load_compiler_variables CompilerId lang) foreach(feature ${ARGN}) set(_cmake_feature_test_${CompilerId}_${feature} ${_cmake_feature_test_${feature}} PARENT_SCOPE) endforeach() - include("${CMAKE_ROOT}/Modules/Compiler/${CompilerId}-DetermineCompiler.cmake" OPTIONAL) + include("${CMAKE_ROOT}/Modules/Compiler/${CompilerId}-${lang}-DetermineCompiler.cmake" OPTIONAL + RESULT_VARIABLE determinedCompiler) + if (NOT determinedCompiler) + include("${CMAKE_ROOT}/Modules/Compiler/${CompilerId}-DetermineCompiler.cmake" OPTIONAL) + endif() set(_compiler_id_version_compute_${CompilerId} ${_compiler_id_version_compute} PARENT_SCOPE) endfunction() |