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
parent
c1789e6986
commit
53d31c2426
|
|
@ -762,13 +762,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
|
|||
SET(COMPILER_IS_COMO 1)
|
||||
ENDIF(CMAKE_BASE_NAME MATCHES "^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}
|
||||
--build-and-test
|
||||
"${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-exe-dir "${CMake_BINARY_DIR}/Tests/Complex/bin"
|
||||
--build-options
|
||||
-DCOMPLEX_TEST_CMAKELIB:BOOL=${COMPLEX_TEST_CMAKELIB}
|
||||
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
|
||||
--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-exe-dir "${CMake_BINARY_DIR}/Tests/ComplexOneConfig/bin"
|
||||
--build-options
|
||||
-DCOMPLEX_TEST_CMAKELIB:BOOL=${COMPLEX_TEST_CMAKELIB}
|
||||
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
|
||||
--test-command complex)
|
||||
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/ComplexOneConfig")
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -5,25 +5,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 1.3)
|
|||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_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.
|
||||
ADD_LIBRARY(ExeImportedTarget UNKNOWN IMPORTED)
|
||||
|
||||
|
|
@ -62,9 +43,6 @@ ADD_EXECUTABLE(complex complex testcflags.c Aout.h)
|
|||
# Sub1/NameConflictTest.c Sub2/NameConflictTest.c)
|
||||
ADD_EXECUTABLE(complex.file complex.file.cxx complex_nobuild.cxx
|
||||
complex_nobuild.c)
|
||||
IF(COMPLEX_TEST_CMAKELIB)
|
||||
TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmlibarchive cmcurl cmexpat cmzlib cmbzip2)
|
||||
ENDIF(COMPLEX_TEST_CMAKELIB)
|
||||
|
||||
IF (UNIX)
|
||||
TARGET_LINK_LIBRARIES(complex ${CMAKE_DL_LIBS})
|
||||
|
|
|
|||
|
|
@ -9,14 +9,10 @@
|
|||
extern "C" {
|
||||
#include "testConly.h"
|
||||
}
|
||||
#ifdef COMPLEX_TEST_CMAKELIB
|
||||
#include "cmStandardIncludes.h"
|
||||
#else
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
#include <stdio.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.
|
||||
#endif
|
||||
|
||||
#ifdef COMPLEX_TEST_CMAKELIB
|
||||
// ======================================================================
|
||||
|
||||
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
|
||||
// so that the dec cxx compiler will instantiate the stuff that
|
||||
// we are using from the CMakeLib library....
|
||||
|
|
@ -792,7 +785,6 @@ int main()
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef COMPLEX_TEST_CMAKELIB
|
||||
// ----------------------------------------------------------------------
|
||||
// Some pre-build/pre-link/post-build custom-commands have been
|
||||
// attached to the lib (see Library/).
|
||||
|
|
@ -838,7 +830,6 @@ int main()
|
|||
// only created during a build.
|
||||
|
||||
TestAndRemoveFile(BINARY_DIR "/Executable/Temp/complex-required.txt");
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
// Test FIND_LIBRARY
|
||||
|
|
|
|||
|
|
@ -4,8 +4,6 @@
|
|||
#cmakedefine ONE_VAR_IS_DEFINED
|
||||
#cmakedefine ZERO_VAR
|
||||
|
||||
#cmakedefine COMPLEX_TEST_CMAKELIB
|
||||
|
||||
#define STRING_VAR "${STRING_VAR}"
|
||||
|
||||
// Test FOREACH
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -5,25 +5,6 @@ CMAKE_MINIMUM_REQUIRED(VERSION 1.3)
|
|||
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DTEST_CXX_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.
|
||||
ADD_LIBRARY(ExeImportedTarget UNKNOWN IMPORTED)
|
||||
|
||||
|
|
@ -62,9 +43,6 @@ ADD_EXECUTABLE(complex complex testcflags.c Aout.h)
|
|||
# Sub1/NameConflictTest.c Sub2/NameConflictTest.c)
|
||||
ADD_EXECUTABLE(complex.file complex.file.cxx complex_nobuild.cxx
|
||||
complex_nobuild.c)
|
||||
IF(COMPLEX_TEST_CMAKELIB)
|
||||
TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmlibarchive cmcurl cmexpat cmzlib cmbzip2)
|
||||
ENDIF(COMPLEX_TEST_CMAKELIB)
|
||||
|
||||
IF (UNIX)
|
||||
TARGET_LINK_LIBRARIES(complex ${CMAKE_DL_LIBS})
|
||||
|
|
|
|||
|
|
@ -9,14 +9,10 @@
|
|||
extern "C" {
|
||||
#include "testConly.h"
|
||||
}
|
||||
#ifdef COMPLEX_TEST_CMAKELIB
|
||||
#include "cmStandardIncludes.h"
|
||||
#else
|
||||
#include <vector>
|
||||
#include <string>
|
||||
#include <iostream>
|
||||
#include <string.h>
|
||||
#endif
|
||||
|
||||
#include <stdio.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.
|
||||
#endif
|
||||
|
||||
#ifdef COMPLEX_TEST_CMAKELIB
|
||||
// ======================================================================
|
||||
|
||||
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
|
||||
// so that the dec cxx compiler will instantiate the stuff that
|
||||
// we are using from the CMakeLib library....
|
||||
|
|
@ -792,7 +785,6 @@ int main()
|
|||
}
|
||||
#endif
|
||||
|
||||
#ifdef COMPLEX_TEST_CMAKELIB
|
||||
// ----------------------------------------------------------------------
|
||||
// Some pre-build/pre-link/post-build custom-commands have been
|
||||
// attached to the lib (see Library/).
|
||||
|
|
@ -838,7 +830,6 @@ int main()
|
|||
// only created during a build.
|
||||
|
||||
TestAndRemoveFile(BINARY_DIR "/Executable/Temp/complex-required.txt");
|
||||
#endif
|
||||
|
||||
// ----------------------------------------------------------------------
|
||||
// Test FIND_LIBRARY
|
||||
|
|
|
|||
|
|
@ -4,8 +4,6 @@
|
|||
#cmakedefine ONE_VAR_IS_DEFINED
|
||||
#cmakedefine ZERO_VAR
|
||||
|
||||
#cmakedefine COMPLEX_TEST_CMAKELIB
|
||||
|
||||
#define STRING_VAR "${STRING_VAR}"
|
||||
|
||||
// Test FOREACH
|
||||
|
|
|
|||
Loading…
Reference in New Issue