mirror of
https://github.com/Kitware/CMake.git
synced 2026-01-05 21:31:08 -06:00
BUG: Fixed cmLocalVisualStudio7Generator to deal with quotes in macro definitions properly. This addresses bug#4983.
This commit is contained in:
@@ -87,7 +87,8 @@ ADD_CUSTOM_COMMAND(TARGET complex POST_BUILD
|
||||
"${Complex_BINARY_DIR}/Executable/postbuild2.txt")
|
||||
|
||||
SET_SOURCE_FILES_PROPERTIES(complex
|
||||
COMPILE_FLAGS "-DFILE_HAS_EXTRA_COMPILE_FLAGS"
|
||||
COMPILE_FLAGS
|
||||
"-DFILE_HAS_EXTRA_COMPILE_FLAGS -DFILE_DEFINE_STRING=\\\"hello\\\""
|
||||
OBJECT_DEPENDS ${Complex_BINARY_DIR}/cmTestGeneratedHeader.h
|
||||
)
|
||||
SET_TARGET_PROPERTIES(complex PROPERTIES COMPILE_FLAGS "-DCOMPLEX_TARGET_FLAG")
|
||||
|
||||
@@ -1139,6 +1139,19 @@ int main()
|
||||
cmPassed("SET_SOURCE_FILES_PROPERTIES succeeded in setting FILE_HAS_EXTRA_COMPILE_FLAGS flag");
|
||||
#endif
|
||||
|
||||
#ifndef FILE_DEFINE_STRING
|
||||
cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting FILE_DEFINE_STRING flag");
|
||||
#else
|
||||
if(strcmp(FILE_DEFINE_STRING, "hello") != 0)
|
||||
{
|
||||
cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting FILE_DEFINE_STRING flag correctly");
|
||||
}
|
||||
else
|
||||
{
|
||||
cmPassed("SET_SOURCE_FILES_PROPERTIES succeeded in setting FILE_DEFINE_STRING flag");
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef FILE_HAS_ABSTRACT
|
||||
cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting ABSTRACT flag");
|
||||
#else
|
||||
|
||||
Reference in New Issue
Block a user