kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

complex: Remove unused option to test CMakeLib 

Now that the Complex tests do not depend on cmSystemTools or other
classes from CMakeLib the COMPLEX_TEST_CMAKELIB option is useless.
This commit is contained in:
Brad King 2011-12-23 15:55:34 -05:00
parent c1789e6986
commit 53d31c2426
9 changed files with 0 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Tests/CMakeLists.txt
View File

@ -762,13 +762,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
SET(COMPILER_IS_COMO 1) SET(COMPILER_IS_COMO 1)
ENDIF(CMAKE_BASE_NAME MATCHES "^como$") ENDIF(CMAKE_BASE_NAME MATCHES "^como$")
IF(NOT COMPILER_IS_COMO) IF(NOT COMPILER_IS_COMO)
SET(COMPLEX_TEST_CMAKELIB 1)
IF(CMAKE_TEST_DIFFERENT_GENERATOR OR CMAKE_TEST_SYSTEM_LIBRARIES)
SET(COMPLEX_TEST_CMAKELIB 0)
ENDIF(CMAKE_TEST_DIFFERENT_GENERATOR OR CMAKE_TEST_SYSTEM_LIBRARIES)
IF(BORLAND)
SET(COMPLEX_TEST_CMAKELIB 0)
ENDIF(BORLAND)
ADD_TEST(complex ${CMAKE_CTEST_COMMAND} ADD_TEST(complex ${CMAKE_CTEST_COMMAND}
--build-and-test --build-and-test
"${CMake_SOURCE_DIR}/Tests/Complex" "${CMake_SOURCE_DIR}/Tests/Complex"
@ -780,7 +773,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Complex/bin" --build-exe-dir "${CMake_BINARY_DIR}/Tests/Complex/bin"
--build-options --build-options
-DCOMPLEX_TEST_CMAKELIB:BOOL=${COMPLEX_TEST_CMAKELIB}
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
--test-command complex --test-command complex
) )
@ -795,7 +787,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM} --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
--build-exe-dir "${CMake_BINARY_DIR}/Tests/ComplexOneConfig/bin" --build-exe-dir "${CMake_BINARY_DIR}/Tests/ComplexOneConfig/bin"
--build-options --build-options
-DCOMPLEX_TEST_CMAKELIB:BOOL=${COMPLEX_TEST_CMAKELIB}
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
--test-command complex) --test-command complex)
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ComplexOneConfig") LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ComplexOneConfig")

5
Tests/Complex/CMakeLists.txt
View File

File diff suppressed because one or more lines are too long

22
Tests/Complex/Executable/CMakeLists.txt
View File

@ -5,25 +5,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 1.3)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_FLAGS") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_FLAGS")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_C_FLAGS") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_C_FLAGS")
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)
# prefer the new curl if it is around
IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0/lib)
ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl)
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl)
ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl)
LINK_DIRECTORIES(
${Complex_BINARY_DIR}/../../Utilities/cmlibarchive/libarchive
${Complex_BINARY_DIR}/../../Utilities/cmbzip2
)
ENDIF(COMPLEX_TEST_CMAKELIB)
# Create an imported target for if(TARGET) test below. # Create an imported target for if(TARGET) test below.
ADD_LIBRARY(ExeImportedTarget UNKNOWN IMPORTED) ADD_LIBRARY(ExeImportedTarget UNKNOWN IMPORTED)
@ -62,9 +43,6 @@ ADD_EXECUTABLE(complex complex testcflags.c Aout.h)
# Sub1/NameConflictTest.c Sub2/NameConflictTest.c) # Sub1/NameConflictTest.c Sub2/NameConflictTest.c)
ADD_EXECUTABLE(complex.file complex.file.cxx complex_nobuild.cxx ADD_EXECUTABLE(complex.file complex.file.cxx complex_nobuild.cxx
complex_nobuild.c) complex_nobuild.c)
IF(COMPLEX_TEST_CMAKELIB)
TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmlibarchive cmcurl cmexpat cmzlib cmbzip2)
ENDIF(COMPLEX_TEST_CMAKELIB)
IF (UNIX) IF (UNIX)
TARGET_LINK_LIBRARIES(complex ${CMAKE_DL_LIBS}) TARGET_LINK_LIBRARIES(complex ${CMAKE_DL_LIBS})

9
Tests/Complex/Executable/complex.cxx
View File

@ -9,14 +9,10 @@
extern "C" { extern "C" {
#include "testConly.h" #include "testConly.h"
} }
#ifdef COMPLEX_TEST_CMAKELIB
#include "cmStandardIncludes.h"
#else
#include <vector> #include <vector>
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <string.h> #include <string.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -69,7 +65,6 @@ void cmPassed(const char* Message, const char* m2="")
# error Per-configuration directory-level definition not inherited. # error Per-configuration directory-level definition not inherited.
#endif #endif
#ifdef COMPLEX_TEST_CMAKELIB
// ====================================================================== // ======================================================================
void TestAndRemoveFile(const char* filename) void TestAndRemoveFile(const char* filename)
@ -107,8 +102,6 @@ void TestDir(const char* filename)
} }
} }
#endif
// Here is a stupid function that tries to use std::string methods // Here is a stupid function that tries to use std::string methods
// so that the dec cxx compiler will instantiate the stuff that // so that the dec cxx compiler will instantiate the stuff that
// we are using from the CMakeLib library.... // we are using from the CMakeLib library....
@ -792,7 +785,6 @@ int main()
} }
#endif #endif
#ifdef COMPLEX_TEST_CMAKELIB
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// Some pre-build/pre-link/post-build custom-commands have been // Some pre-build/pre-link/post-build custom-commands have been
// attached to the lib (see Library/). // attached to the lib (see Library/).
@ -838,7 +830,6 @@ int main()
// only created during a build. // only created during a build.
TestAndRemoveFile(BINARY_DIR "/Executable/Temp/complex-required.txt"); TestAndRemoveFile(BINARY_DIR "/Executable/Temp/complex-required.txt");
#endif
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// Test FIND_LIBRARY // Test FIND_LIBRARY

2
Tests/Complex/cmTestConfigure.h.in
View File

@ -4,8 +4,6 @@
#cmakedefine ONE_VAR_IS_DEFINED #cmakedefine ONE_VAR_IS_DEFINED
#cmakedefine ZERO_VAR #cmakedefine ZERO_VAR
#cmakedefine COMPLEX_TEST_CMAKELIB
#define STRING_VAR "${STRING_VAR}" #define STRING_VAR "${STRING_VAR}"
// Test FOREACH // Test FOREACH

5
Tests/ComplexOneConfig/CMakeLists.txt
View File

File diff suppressed because one or more lines are too long

22
Tests/ComplexOneConfig/Executable/CMakeLists.txt
View File

@ -5,25 +5,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 1.3)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_FLAGS") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_FLAGS")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_C_FLAGS") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTEST_C_FLAGS")
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)
# prefer the new curl if it is around
IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0/lib)
ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl-7.19.0)
IF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl)
LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmcurl)
ENDIF(EXISTS ${Complex_BINARY_DIR}/../../Utilities/cmcurl)
LINK_DIRECTORIES(
${Complex_BINARY_DIR}/../../Utilities/cmlibarchive/libarchive
${Complex_BINARY_DIR}/../../Utilities/cmbzip2
)
ENDIF(COMPLEX_TEST_CMAKELIB)
# Create an imported target for if(TARGET) test below. # Create an imported target for if(TARGET) test below.
ADD_LIBRARY(ExeImportedTarget UNKNOWN IMPORTED) ADD_LIBRARY(ExeImportedTarget UNKNOWN IMPORTED)
@ -62,9 +43,6 @@ ADD_EXECUTABLE(complex complex testcflags.c Aout.h)
# Sub1/NameConflictTest.c Sub2/NameConflictTest.c) # Sub1/NameConflictTest.c Sub2/NameConflictTest.c)
ADD_EXECUTABLE(complex.file complex.file.cxx complex_nobuild.cxx ADD_EXECUTABLE(complex.file complex.file.cxx complex_nobuild.cxx
complex_nobuild.c) complex_nobuild.c)
IF(COMPLEX_TEST_CMAKELIB)
TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmlibarchive cmcurl cmexpat cmzlib cmbzip2)
ENDIF(COMPLEX_TEST_CMAKELIB)
IF (UNIX) IF (UNIX)
TARGET_LINK_LIBRARIES(complex ${CMAKE_DL_LIBS}) TARGET_LINK_LIBRARIES(complex ${CMAKE_DL_LIBS})

9
Tests/ComplexOneConfig/Executable/complex.cxx
View File

@ -9,14 +9,10 @@
extern "C" { extern "C" {
#include "testConly.h" #include "testConly.h"
} }
#ifdef COMPLEX_TEST_CMAKELIB
#include "cmStandardIncludes.h"
#else
#include <vector> #include <vector>
#include <string> #include <string>
#include <iostream> #include <iostream>
#include <string.h> #include <string.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -69,7 +65,6 @@ void cmPassed(const char* Message, const char* m2="")
# error Per-configuration directory-level definition not inherited. # error Per-configuration directory-level definition not inherited.
#endif #endif
#ifdef COMPLEX_TEST_CMAKELIB
// ====================================================================== // ======================================================================
void TestAndRemoveFile(const char* filename) void TestAndRemoveFile(const char* filename)
@ -107,8 +102,6 @@ void TestDir(const char* filename)
} }
} }
#endif
// Here is a stupid function that tries to use std::string methods // Here is a stupid function that tries to use std::string methods
// so that the dec cxx compiler will instantiate the stuff that // so that the dec cxx compiler will instantiate the stuff that
// we are using from the CMakeLib library.... // we are using from the CMakeLib library....
@ -792,7 +785,6 @@ int main()
} }
#endif #endif
#ifdef COMPLEX_TEST_CMAKELIB
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// Some pre-build/pre-link/post-build custom-commands have been // Some pre-build/pre-link/post-build custom-commands have been
// attached to the lib (see Library/). // attached to the lib (see Library/).
@ -838,7 +830,6 @@ int main()
// only created during a build. // only created during a build.
TestAndRemoveFile(BINARY_DIR "/Executable/Temp/complex-required.txt"); TestAndRemoveFile(BINARY_DIR "/Executable/Temp/complex-required.txt");
#endif
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------
// Test FIND_LIBRARY // Test FIND_LIBRARY

2
Tests/ComplexOneConfig/cmTestConfigure.h.in
View File

@ -4,8 +4,6 @@
#cmakedefine ONE_VAR_IS_DEFINED #cmakedefine ONE_VAR_IS_DEFINED
#cmakedefine ZERO_VAR #cmakedefine ZERO_VAR
#cmakedefine COMPLEX_TEST_CMAKELIB
#define STRING_VAR "${STRING_VAR}" #define STRING_VAR "${STRING_VAR}"
// Test FOREACH // Test FOREACH