[cmake-commits] hoffman committed CMakeLists.txt 1.49.2.6 1.49.2.7
complex.cxx 1.84.2.6 1.84.2.7
cmake-commits at cmake.org
cmake-commits at cmake.org
Fri Oct 27 16:01:56 EDT 2006
Update of /cvsroot/CMake/CMake/Tests/Complex/Executable
In directory public:/mounts/ram/cvs-serv22632/Tests/Complex/Executable
Modified Files:
Tag: CMake-2-4
CMakeLists.txt complex.cxx
Log Message:
ENH: move changes from main tree
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Complex/Executable/CMakeLists.txt,v
retrieving revision 1.49.2.6
retrieving revision 1.49.2.7
diff -u -d -r1.49.2.6 -r1.49.2.7
--- CMakeLists.txt 13 Oct 2006 14:52:09 -0000 1.49.2.6
+++ CMakeLists.txt 27 Oct 2006 20:01:54 -0000 1.49.2.7
@@ -6,14 +6,14 @@
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_C_FLAGS")
SET(CMAKE_C_FLAGS "${CMAKE_ANSI_CFLAGS} ${CMAKE_C_FLAGS}")
-IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+IF(COMPLEX_TEST_CMAKELIB)
# Link to CMake lib
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source)
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys)
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat)
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib)
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar)
-ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+ENDIF(COMPLEX_TEST_CMAKELIB)
# Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to
SET(COMPLEX_LIBS CMakeTestLibrary;CMakeTestLibraryShared;CMakeTestCLibraryShared)
@@ -23,9 +23,9 @@
ADD_EXECUTABLE(complex complex testcflags.c )
# Sub1/NameConflictTest.c Sub2/NameConflictTest.c)
ADD_EXECUTABLE(complex.file complex.file.cxx)
-IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+IF(COMPLEX_TEST_CMAKELIB)
TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar)
-ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+ENDIF(COMPLEX_TEST_CMAKELIB)
IF (UNIX)
TARGET_LINK_LIBRARIES(complex ${CMAKE_DL_LIBS})
Index: complex.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/Complex/Executable/complex.cxx,v
retrieving revision 1.84.2.6
retrieving revision 1.84.2.7
diff -u -d -r1.84.2.6 -r1.84.2.7
--- complex.cxx 13 Oct 2006 14:52:09 -0000 1.84.2.6
+++ complex.cxx 27 Oct 2006 20:01:54 -0000 1.84.2.7
@@ -8,7 +8,7 @@
extern "C" {
#include "testConly.h"
}
-#ifndef CMAKE_TEST_DIFFERENT_GENERATOR
+#ifdef COMPLEX_TEST_CMAKELIB
#include "cmStandardIncludes.h"
#include "cmSystemTools.h"
#include "cmDynamicLoader.h"
@@ -64,7 +64,7 @@
This is a problem. Looks like ADD_DEFINITIONS and REMOVE_DEFINITIONS does not work
#endif
-#ifndef CMAKE_TEST_DIFFERENT_GENERATOR
+#ifdef COMPLEX_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 @@
#endif
std::string exe = lib;
-#ifndef CMAKE_TEST_DIFFERENT_GENERATOR
+#ifdef COMPLEX_TEST_CMAKELIB
// Test a single character executable to test a: in makefiles
exe += "A";
exe += cmSystemTools::GetExecutableExtension();
@@ -1059,7 +1059,7 @@
}
#endif
-#ifndef CMAKE_TEST_DIFFERENT_GENERATOR
+#ifdef COMPLEX_TEST_CMAKELIB
// ----------------------------------------------------------------------
// Some pre-build/pre-link/post-build custom-commands have been
// attached to the lib (see Library/).
@@ -1257,7 +1257,7 @@
cmPassed("CMake SET CACHE FORCE");
#endif
-#ifndef CMAKE_TEST_DIFFERENT_GENERATOR
+#ifdef COMPLEX_TEST_CMAKELIB
// first run with shouldFail = true, this will
// run with A B C as set by the CMakeList.txt file.
if(!TestLibraryOrder(true))
More information about the Cmake-commits
mailing list