diff options
| author | Brad King <brad.king@kitware.com> | 2006-10-19 18:45:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2006-10-19 18:45:41 (GMT) |
| commit | b646183f441bcc3c9f3b094defbe71a3b56a60a3 (patch) | |
| tree | 78905f86d15d4997b587f368c3f069af1e6e60c5 /Tests/ComplexOneConfig/Executable/complex.cxx | |
| parent | 93ce08e373c8ba7fa844fd3fa04f113e2c2a2d71 (diff) | |
| download | CMake-b646183f441bcc3c9f3b094defbe71a3b56a60a3.zip CMake-b646183f441bcc3c9f3b094defbe71a3b56a60a3.tar.gz CMake-b646183f441bcc3c9f3b094defbe71a3b56a60a3.tar.bz2 | |
ENH: Added explicit name for option to test CMakeLib. Added option to disable testing of CMakeLib if system utility libraries are used until linking made easier.
Diffstat (limited to 'Tests/ComplexOneConfig/Executable/complex.cxx')
| -rw-r--r-- | Tests/ComplexOneConfig/Executable/complex.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Tests/ComplexOneConfig/Executable/complex.cxx b/Tests/ComplexOneConfig/Executable/complex.cxx index 273e8a2..89c7dbd 100644 --- a/Tests/ComplexOneConfig/Executable/complex.cxx +++ b/Tests/ComplexOneConfig/Executable/complex.cxx @@ -8,7 +8,7 @@ extern "C" { #include "testConly.h" } -#ifndef CMAKE_TEST_DIFFERENT_GENERATOR +#ifdef CMAKE_TEST_CMAKELIB #include "cmStandardIncludes.h" #include "cmSystemTools.h" #include "cmDynamicLoader.h" @@ -64,7 +64,7 @@ void cmPassed(const char* Message, const char* m2="") This is a problem. Looks like ADD_DEFINITIONS and REMOVE_DEFINITIONS does not work #endif -#ifndef CMAKE_TEST_DIFFERENT_GENERATOR +#ifdef CMAKE_TEST_CMAKELIB // Here is a stupid function that tries to use std::string methods // so that the dec cxx compiler will instantiate the stuff that // we are using from the CMakeLib library.... @@ -327,7 +327,7 @@ int main() #endif std::string exe = lib; -#ifndef CMAKE_TEST_DIFFERENT_GENERATOR +#ifdef CMAKE_TEST_CMAKELIB // Test a single character executable to test a: in makefiles exe += "A"; exe += cmSystemTools::GetExecutableExtension(); @@ -1059,7 +1059,7 @@ int main() } #endif -#ifndef CMAKE_TEST_DIFFERENT_GENERATOR +#ifdef CMAKE_TEST_CMAKELIB // ---------------------------------------------------------------------- // Some pre-build/pre-link/post-build custom-commands have been // attached to the lib (see Library/). @@ -1257,7 +1257,7 @@ int main() cmPassed("CMake SET CACHE FORCE"); #endif -#ifndef CMAKE_TEST_DIFFERENT_GENERATOR +#ifdef CMAKE_TEST_CMAKELIB // first run with shouldFail = true, this will // run with A B C as set by the CMakeList.txt file. if(!TestLibraryOrder(true)) |