1
0
Эх сурвалжийг харах

BUG: Disable test of feature that is not documented or implemented everywhere.

Brad King 18 жил өмнө
parent
commit
b384218ec1

+ 2 - 1
Tests/Complex/Executable/CMakeLists.txt

@@ -88,7 +88,8 @@ ADD_CUSTOM_COMMAND(TARGET complex POST_BUILD
 
 SET_SOURCE_FILES_PROPERTIES(complex
   COMPILE_FLAGS
-  "-DFILE_HAS_EXTRA_COMPILE_FLAGS -DFILE_DEFINE_STRING=\\\"hello\\\""
+  "-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")

+ 2 - 0
Tests/Complex/Executable/complex.cxx

@@ -1139,6 +1139,7 @@ int main()
   cmPassed("SET_SOURCE_FILES_PROPERTIES succeeded in setting FILE_HAS_EXTRA_COMPILE_FLAGS flag");
 #endif
 
+#if 0  // Disable until implemented everywhere.
 #ifndef FILE_DEFINE_STRING
   cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting FILE_DEFINE_STRING flag");
 #else
@@ -1151,6 +1152,7 @@ int main()
     cmPassed("SET_SOURCE_FILES_PROPERTIES succeeded in setting FILE_DEFINE_STRING flag");
     }
 #endif
+#endif
 
 #ifndef FILE_HAS_ABSTRACT
   cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting ABSTRACT flag");

+ 2 - 1
Tests/ComplexOneConfig/Executable/CMakeLists.txt

@@ -88,7 +88,8 @@ ADD_CUSTOM_COMMAND(TARGET complex POST_BUILD
 
 SET_SOURCE_FILES_PROPERTIES(complex
   COMPILE_FLAGS
-  "-DFILE_HAS_EXTRA_COMPILE_FLAGS -DFILE_DEFINE_STRING=\\\"hello\\\""
+  "-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")

+ 2 - 0
Tests/ComplexOneConfig/Executable/complex.cxx

@@ -1139,6 +1139,7 @@ int main()
   cmPassed("SET_SOURCE_FILES_PROPERTIES succeeded in setting FILE_HAS_EXTRA_COMPILE_FLAGS flag");
 #endif
 
+#if 0  // Disable until implemented everywhere.
 #ifndef FILE_DEFINE_STRING
   cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting FILE_DEFINE_STRING flag");
 #else
@@ -1151,6 +1152,7 @@ int main()
     cmPassed("SET_SOURCE_FILES_PROPERTIES succeeded in setting FILE_DEFINE_STRING flag");
     }
 #endif
+#endif
 
 #ifndef FILE_HAS_ABSTRACT
   cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting ABSTRACT flag");

+ 2 - 1
Tests/ComplexRelativePaths/Executable/CMakeLists.txt

@@ -88,7 +88,8 @@ ADD_CUSTOM_COMMAND(TARGET complex POST_BUILD
 
 SET_SOURCE_FILES_PROPERTIES(complex
   COMPILE_FLAGS
-  "-DFILE_HAS_EXTRA_COMPILE_FLAGS -DFILE_DEFINE_STRING=\\\"hello\\\""
+  "-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")

+ 2 - 0
Tests/ComplexRelativePaths/Executable/complex.cxx

@@ -1139,6 +1139,7 @@ int main()
   cmPassed("SET_SOURCE_FILES_PROPERTIES succeeded in setting FILE_HAS_EXTRA_COMPILE_FLAGS flag");
 #endif
 
+#if 0  // Disable until implemented everywhere.
 #ifndef FILE_DEFINE_STRING
   cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting FILE_DEFINE_STRING flag");
 #else
@@ -1151,6 +1152,7 @@ int main()
     cmPassed("SET_SOURCE_FILES_PROPERTIES succeeded in setting FILE_DEFINE_STRING flag");
     }
 #endif
+#endif
 
 #ifndef FILE_HAS_ABSTRACT
   cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting ABSTRACT flag");