mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-17 04:31:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Genex: Enable COMPILE_LANGUAGE for file(GENERATE) with Visual Studio

Browse Source 
Issue: #17435
This commit is contained in:
Brad King
2017-11-17 14:31:07 -05:00
parent 0f6f7c8ab1
commit 2b7d59f310
5 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmGeneratorExpressionNode.cxx
View File

@@ -828,12 +828,16 @@ static const struct CompileLanguageNode : public cmGeneratorExpressionNode
} }
std::string genName = gg->GetName(); std::string genName = gg->GetName();
if (genName.find("Visual Studio") != std::string::npos) { if (genName.find("Visual Studio") != std::string::npos) {
reportError(context, content->GetOriginalExpression(), if (dagChecker && (dagChecker->EvaluatingCompileDefinitions() ||
"$<COMPILE_LANGUAGE:...> may not be used with Visual Studio " dagChecker->EvaluatingCompileOptions() ||
"generators."); dagChecker->EvaluatingIncludeDirectories())) {
return std::string(); reportError(
} context, content->GetOriginalExpression(),
if (genName.find("Xcode") != std::string::npos) { "$<COMPILE_LANGUAGE:...> may only be used for file(GENERATE) "
"with the Visual Studio generator.");
return std::string();
}
} else if (genName.find("Xcode") != std::string::npos) {
if (dagChecker && (dagChecker->EvaluatingCompileDefinitions() || if (dagChecker && (dagChecker->EvaluatingCompileDefinitions() ||
dagChecker->EvaluatingIncludeDirectories())) { dagChecker->EvaluatingIncludeDirectories())) {
reportError( reportError(

3
Tests/RunCMake/COMPILE_LANGUAGE-genex/CompileDefinitions-stderr-VS.txt
View File

@@ -3,6 +3,7 @@ CMake Error at CompileDefinitions.cmake:5 \(target_compile_definitions\):
\$<COMPILE_LANGUAGE:CXX> \$<COMPILE_LANGUAGE:CXX>
\$<COMPILE_LANGUAGE:...> may not be used with Visual Studio generators. \$<COMPILE_LANGUAGE:...> may only be used for file\(GENERATE\) with the Visual
Studio generator.
Call Stack \(most recent call first\): Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\) CMakeLists.txt:3 \(include\)

3
Tests/RunCMake/COMPILE_LANGUAGE-genex/CompileOptions-stderr-VS.txt
View File

@@ -3,6 +3,7 @@ CMake Error at CompileOptions.cmake:5 \(target_compile_options\):
\$<COMPILE_LANGUAGE:CXX> \$<COMPILE_LANGUAGE:CXX>
\$<COMPILE_LANGUAGE:...> may not be used with Visual Studio generators. \$<COMPILE_LANGUAGE:...> may only be used for file\(GENERATE\) with the Visual
Studio generator.
Call Stack \(most recent call first\): Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\) CMakeLists.txt:3 \(include\)

3
Tests/RunCMake/COMPILE_LANGUAGE-genex/IncludeDirectories-stderr-VS.txt
View File

@@ -3,6 +3,7 @@ CMake Error at IncludeDirectories.cmake:5 \(target_include_directories\):
\$<COMPILE_LANGUAGE:CXX> \$<COMPILE_LANGUAGE:CXX>
\$<COMPILE_LANGUAGE:...> may not be used with Visual Studio generators. \$<COMPILE_LANGUAGE:...> may only be used for file\(GENERATE\) with the Visual
Studio generator.
Call Stack \(most recent call first\): Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\) CMakeLists.txt:3 \(include\)

16
Tests/RunCMake/File_Generate/RunCMakeTest.cmake
View File

@@ -21,15 +21,13 @@ if (NOT file_contents MATCHES "generated.cpp.rule")
message(SEND_ERROR "Rule file not in target sources! ${file_contents}") message(SEND_ERROR "Rule file not in target sources! ${file_contents}")
endif() endif()
if (NOT RunCMake_GENERATOR MATCHES "Visual Studio") run_cmake(COMPILE_LANGUAGE-genex)
run_cmake(COMPILE_LANGUAGE-genex) foreach(l CXX C)
foreach(l CXX C) file(READ "${RunCMake_BINARY_DIR}/COMPILE_LANGUAGE-genex-build/opts-${l}.txt" l_defs)
file(READ "${RunCMake_BINARY_DIR}/COMPILE_LANGUAGE-genex-build/opts-${l}.txt" l_defs) if (NOT l_defs STREQUAL "LANG_IS_${l}\n")
if (NOT l_defs STREQUAL "LANG_IS_${l}\n") message(FATAL_ERROR "File content does not match: ${l_defs}")
message(FATAL_ERROR "File content does not match: ${l_defs}") endif()
endif() endforeach()
endforeach()
endif()
set(timeformat "%Y%j%H%M%S") set(timeformat "%Y%j%H%M%S")