diff options
author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-10-08 09:13:24 +0900 |
---|---|---|
committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-10-08 09:13:24 +0900 |
commit | e42c4abb646a39cdd5d1ccb22a9619990ce2a898 (patch) | |
tree | 5c4a99e76409f26c9525137e845d0bac7efa8c7b /Tests/ComplexOneConfig | |
parent | 07408dd83a3637a29a56a7d5fbe49f63cbb41e8f (diff) | |
download | cmake-e42c4abb646a39cdd5d1ccb22a9619990ce2a898.tar.gz cmake-e42c4abb646a39cdd5d1ccb22a9619990ce2a898.tar.bz2 cmake-e42c4abb646a39cdd5d1ccb22a9619990ce2a898.zip |
Imported Upstream version 3.12.0upstream/3.12.0
Diffstat (limited to 'Tests/ComplexOneConfig')
-rw-r--r-- | Tests/ComplexOneConfig/Cache/CMakeCache.txt | 2 | ||||
-rw-r--r-- | Tests/ComplexOneConfig/Executable/complex.cxx | 52 | ||||
-rw-r--r-- | Tests/ComplexOneConfig/Executable/complex.file.cxx | 2 | ||||
-rw-r--r-- | Tests/ComplexOneConfig/Executable/notInAllExe.cxx | 2 | ||||
-rw-r--r-- | Tests/ComplexOneConfig/Library/CMakeLists.txt | 2 | ||||
-rw-r--r-- | Tests/ComplexOneConfig/Library/notInAllLib.cxx | 2 | ||||
-rw-r--r-- | Tests/ComplexOneConfig/Library/sharedFile.h | 12 | ||||
-rw-r--r-- | Tests/ComplexOneConfig/Library/testConly.h | 12 |
8 files changed, 43 insertions, 43 deletions
diff --git a/Tests/ComplexOneConfig/Cache/CMakeCache.txt b/Tests/ComplexOneConfig/Cache/CMakeCache.txt index 17c55aa01..727faa2e7 100644 --- a/Tests/ComplexOneConfig/Cache/CMakeCache.txt +++ b/Tests/ComplexOneConfig/Cache/CMakeCache.txt @@ -5,7 +5,7 @@ # If you do want to change a value, simply edit, save, and exit the editor. # The syntax for the file is as follows: # KEY:TYPE=VALUE -# KEY is the name of a varible in the cache. +# KEY is the name of a variable in the cache. # TYPE is a hint to GUI's for the type of VALUE, DO NOT EDIT TYPE!. # VALUE is the current value for the KEY. diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx index 9b94962e1..5b5089960 100644 --- a/Tests/ComplexOneConfig/Executable/complex.cxx +++ b/Tests/ComplexOneConfig/Executable/complex.cxx @@ -17,7 +17,7 @@ extern "C" { #include <stdio.h> #include <sys/stat.h> #if !defined(S_ISDIR) -#define S_ISDIR(mode) ((mode)&_S_IFDIR) +# define S_ISDIR(mode) ((mode)&_S_IFDIR) #endif #ifdef COMPLEX_TEST_LINK_STATIC @@ -45,23 +45,23 @@ void cmPassed(const char* Message, const char* m2 = "") } #ifndef COMPLEX_DEFINED_PRE -#error "COMPLEX_DEFINED_PRE not defined!" +# error "COMPLEX_DEFINED_PRE not defined!" #endif #ifdef COMPLEX_DEFINED -#error "COMPLEX_DEFINED is defined but it should not!" +# error "COMPLEX_DEFINED is defined but it should not!" #endif #ifndef COMPLEX_DEFINED_POST -#error "COMPLEX_DEFINED_POST not defined!" +# error "COMPLEX_DEFINED_POST not defined!" #endif #ifndef CMAKE_IS_REALLY_FUN -#error This is a problem. Looks like ADD_DEFINITIONS and REMOVE_DEFINITIONS does not work +# error This is a problem. Looks like ADD_DEFINITIONS and REMOVE_DEFINITIONS does not work #endif #if defined(NDEBUG) && !defined(CMAKE_IS_FUN_IN_RELEASE_MODE) -#error Per-configuration directory-level definition not inherited. +# error Per-configuration directory-level definition not inherited. #endif // ====================================================================== @@ -200,8 +200,8 @@ int main() cmFailed(msg); } -// ---------------------------------------------------------------------- -// Test ADD_DEFINITIONS + // ---------------------------------------------------------------------- + // Test ADD_DEFINITIONS #ifndef CMAKE_IS_FUN cmFailed("CMake is not fun, so it is broken and should be fixed."); @@ -240,8 +240,8 @@ int main() cmPassed("CMake found the listfile stack properly"); #endif -// ---------------------------------------------------------------------- -// Test SET, VARIABLE_REQUIRES + // ---------------------------------------------------------------------- + // Test SET, VARIABLE_REQUIRES #ifdef SHOULD_NOT_BE_DEFINED cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED is defined."); @@ -297,8 +297,8 @@ int main() } #endif -// ---------------------------------------------------------------------- -// Test various IF/ELSE combinations + // ---------------------------------------------------------------------- + // Test various IF/ELSE combinations #ifdef SHOULD_NOT_BE_DEFINED_NOT cmFailed("IF or SET is broken, SHOULD_NOT_BE_DEFINED_NOT is defined."); @@ -740,8 +740,8 @@ int main() cmPassed("SHOULD_BE_DEFINED_STRGREATER_EQUAL3 is defined."); #endif -// ---------------------------------------------------------------------- -// Test FOREACH + // ---------------------------------------------------------------------- + // Test FOREACH #ifndef FOREACH_VAR1 cmFailed("the FOREACH, SET or CONFIGURE_FILE command is broken, " @@ -791,8 +791,8 @@ int main() cmPassed("WHILE command is working"); } -// ---------------------------------------------------------------------- -// Test LOAD_CACHE + // ---------------------------------------------------------------------- + // Test LOAD_CACHE #ifndef CACHE_TEST_VAR1 cmFailed("the LOAD_CACHE or CONFIGURE_FILE command is broken, " @@ -901,8 +901,8 @@ int main() TestAndRemoveFile("Executable/Temp/complex-required.txt"); -// ---------------------------------------------------------------------- -// Test FIND_LIBRARY + // ---------------------------------------------------------------------- + // Test FIND_LIBRARY #ifndef FIND_DUMMY_LIB cmFailed("the CONFIGURE_FILE command is broken, " @@ -917,8 +917,8 @@ int main() } #endif -// ---------------------------------------------------------------------- -// Test SET_SOURCE_FILES_PROPERTIES + // ---------------------------------------------------------------------- + // Test SET_SOURCE_FILES_PROPERTIES #ifndef FILE_HAS_EXTRA_COMPILE_FLAGS cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting " @@ -929,9 +929,9 @@ int main() #endif #if 0 // Disable until implemented everywhere. -#ifndef FILE_DEFINE_STRING +# ifndef FILE_DEFINE_STRING cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting FILE_DEFINE_STRING flag"); -#else +# else if(strcmp(FILE_DEFINE_STRING, "hello") != 0) { cmFailed("SET_SOURCE_FILES_PROPERTIES failed at setting FILE_DEFINE_STRING flag correctly"); @@ -940,7 +940,7 @@ int main() { cmPassed("SET_SOURCE_FILES_PROPERTIES succeeded in setting FILE_DEFINE_STRING flag"); } -#endif +# endif #endif #ifndef FILE_HAS_ABSTRACT @@ -973,10 +973,10 @@ int main() // ---------------------------------------------------------------------- // Test registry (win32) #if defined(_WIN32) && !defined(__CYGWIN__) -#ifndef REGISTRY_TEST_PATH +# ifndef REGISTRY_TEST_PATH cmFailed("the CONFIGURE_FILE command is broken, REGISTRY_TEST_PATH is not " "defined."); -#else +# else std::cout << "REGISTRY_TEST_PATH == " << REGISTRY_TEST_PATH << "\n"; if (stricmp(REGISTRY_TEST_PATH, BINARY_DIR "/registry_dir") != 0) { cmFailed("the 'read registry value' function or CONFIGURE_FILE command is " @@ -985,7 +985,7 @@ int main() } else { cmPassed("REGISTRY_TEST_PATH == ", REGISTRY_TEST_PATH); } -#endif +# endif #endif // defined(_WIN32) && !defined(__CYGWIN__) if (strcmp(CMAKE_MINIMUM_REQUIRED_VERSION, "2.4") == 0) { diff --git a/Tests/ComplexOneConfig/Executable/complex.file.cxx b/Tests/ComplexOneConfig/Executable/complex.file.cxx index cfba9ed42..55964302d 100644 --- a/Tests/ComplexOneConfig/Executable/complex.file.cxx +++ b/Tests/ComplexOneConfig/Executable/complex.file.cxx @@ -1,5 +1,5 @@ #if 0 -#include "cmMissingHeader.h" +# include "cmMissingHeader.h" #endif int main(int, char**) diff --git a/Tests/ComplexOneConfig/Executable/notInAllExe.cxx b/Tests/ComplexOneConfig/Executable/notInAllExe.cxx index 2685073d6..2b857b47c 100644 --- a/Tests/ComplexOneConfig/Executable/notInAllExe.cxx +++ b/Tests/ComplexOneConfig/Executable/notInAllExe.cxx @@ -6,5 +6,5 @@ int main() } #if 1 -#error "This target should not be compiled by ALL." +# error "This target should not be compiled by ALL." #endif diff --git a/Tests/ComplexOneConfig/Library/CMakeLists.txt b/Tests/ComplexOneConfig/Library/CMakeLists.txt index dbf806e4f..64f6dc854 100644 --- a/Tests/ComplexOneConfig/Library/CMakeLists.txt +++ b/Tests/ComplexOneConfig/Library/CMakeLists.txt @@ -48,7 +48,7 @@ add_library(CMakeTestCLibraryShared SHARED testConly.c) define_property( TARGET PROPERTY FOO BRIEF_DOCS "a test property" - FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" + FULL_DOCS "A simple test property that means nothing and is used for nothing" ) set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. diff --git a/Tests/ComplexOneConfig/Library/notInAllLib.cxx b/Tests/ComplexOneConfig/Library/notInAllLib.cxx index e66ea056f..033988fd8 100644 --- a/Tests/ComplexOneConfig/Library/notInAllLib.cxx +++ b/Tests/ComplexOneConfig/Library/notInAllLib.cxx @@ -4,5 +4,5 @@ int notInAllLibFunc() } #if 1 -#error "This target should not be compiled by ALL." +# error "This target should not be compiled by ALL." #endif diff --git a/Tests/ComplexOneConfig/Library/sharedFile.h b/Tests/ComplexOneConfig/Library/sharedFile.h index e32fcb760..830cbd5e8 100644 --- a/Tests/ComplexOneConfig/Library/sharedFile.h +++ b/Tests/ComplexOneConfig/Library/sharedFile.h @@ -1,12 +1,12 @@ #if defined(_WIN32) || defined(WIN32) /* Win32 version */ -#ifdef CMakeTestLibraryShared_EXPORTS -#define CMakeTest_EXPORT __declspec(dllexport) -#else -#define CMakeTest_EXPORT __declspec(dllimport) -#endif +# ifdef CMakeTestLibraryShared_EXPORTS +# define CMakeTest_EXPORT __declspec(dllexport) +# else +# define CMakeTest_EXPORT __declspec(dllimport) +# endif #else /* unix needs nothing */ -#define CMakeTest_EXPORT +# define CMakeTest_EXPORT #endif CMakeTest_EXPORT int sharedFunction(); diff --git a/Tests/ComplexOneConfig/Library/testConly.h b/Tests/ComplexOneConfig/Library/testConly.h index 9b0fb73ff..02b28ccab 100644 --- a/Tests/ComplexOneConfig/Library/testConly.h +++ b/Tests/ComplexOneConfig/Library/testConly.h @@ -1,12 +1,12 @@ #if defined(_WIN32) || defined(WIN32) /* Win32 version */ -#ifdef CMakeTestCLibraryShared_EXPORTS -#define CMakeTest_EXPORT __declspec(dllexport) -#else -#define CMakeTest_EXPORT __declspec(dllimport) -#endif +# ifdef CMakeTestCLibraryShared_EXPORTS +# define CMakeTest_EXPORT __declspec(dllexport) +# else +# define CMakeTest_EXPORT __declspec(dllimport) +# endif #else /* unix needs nothing */ -#define CMakeTest_EXPORT +# define CMakeTest_EXPORT #endif CMakeTest_EXPORT int CsharedFunction(); |