ENH: Cleanup
This commit is contained in:
parent
d11ae3062e
commit
f5e6885155
|
@ -12,7 +12,7 @@ CONFIGURE_FILE(
|
|||
"${CMake_BINARY_DIR}/Source/CPack/cmCPackConfigure.h"
|
||||
)
|
||||
|
||||
# add the include path to find the .h
|
||||
# add the include path to find the .h
|
||||
INCLUDE_DIRECTORIES(
|
||||
"${CMake_BINARY_DIR}/Source"
|
||||
"${CMake_SOURCE_DIR}/Source"
|
||||
|
@ -215,11 +215,6 @@ ENDIF (WIN32)
|
|||
ADD_LIBRARY(CMakeLib ${SRCS})
|
||||
TARGET_LINK_LIBRARIES(CMakeLib cmsys ${CMAKE_EXPAT_LIBRARIES} ${CMAKE_ZLIB_LIBRARIES} ${CMAKE_TAR_LIBRARIES})
|
||||
|
||||
# On UNIX platforms we need the dl libraries for loading plugins.
|
||||
IF(UNIX)
|
||||
TARGET_LINK_LIBRARIES(CMakeLib ${CMAKE_DL_LIBS})
|
||||
ENDIF(UNIX)
|
||||
|
||||
# On Apple we need Carbon
|
||||
IF(APPLE)
|
||||
TARGET_LINK_LIBRARIES(CMakeLib "-framework Carbon")
|
||||
|
@ -241,7 +236,7 @@ INCLUDE_DIRECTORIES(
|
|||
#
|
||||
# Sources for CTestLib
|
||||
#
|
||||
SET(CMTEST_SRCS cmCTest.cxx
|
||||
SET(CMTEST_SRCS cmCTest.cxx
|
||||
CTest/cmCTestBuildAndTestHandler.cxx
|
||||
CTest/cmCTestBuildCommand.cxx
|
||||
CTest/cmCTestBuildHandler.cxx
|
||||
|
@ -349,7 +344,7 @@ IF(BUILD_TESTING)
|
|||
ENDIF(NOT CMAKE_TEST_GENERATOR)
|
||||
|
||||
# This variable is set by cmake, however to
|
||||
# test cmake we want to make sure that
|
||||
# test cmake we want to make sure that
|
||||
# the ctest from this cmake is used for testing
|
||||
# and not the ctest from the cmake building and testing
|
||||
# cmake.
|
||||
|
@ -360,27 +355,27 @@ IF(BUILD_TESTING)
|
|||
MARK_AS_ADVANCED(CMAKE_RUN_LONG_TESTS)
|
||||
|
||||
ADD_TEST(CommandLineTest ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/CommandLineTest"
|
||||
"${CMake_BINARY_DIR}/Tests/CommandLineTest"
|
||||
--build-two-config
|
||||
--build-two-config
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--build-project CommandLineTest
|
||||
--test-command CommandLineTest)
|
||||
|
||||
ADD_TEST(TarTest ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/TarTest"
|
||||
"${CMake_BINARY_DIR}/Tests/TarTest"
|
||||
--build-two-config
|
||||
--build-two-config
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--build-project TestTar
|
||||
--test-command TestTarExec)
|
||||
|
||||
ADD_TEST(CustomCommand ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/CustomCommand"
|
||||
"${CMake_BINARY_DIR}/Tests/CustomCommand"
|
||||
--build-two-config
|
||||
|
@ -392,7 +387,7 @@ IF(BUILD_TESTING)
|
|||
)
|
||||
|
||||
ADD_TEST(CustomCommandWorkingDirectory ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/CustomCommandWorkingDirectory"
|
||||
"${CMake_BINARY_DIR}/Tests/CustomCommandWorkingDirectory"
|
||||
--build-two-config
|
||||
|
@ -404,7 +399,7 @@ IF(BUILD_TESTING)
|
|||
)
|
||||
|
||||
ADD_TEST(FindPackageTest ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/FindPackageTest"
|
||||
"${CMake_BINARY_DIR}/Tests/FindPackageTest"
|
||||
--build-two-config
|
||||
|
@ -414,7 +409,7 @@ IF(BUILD_TESTING)
|
|||
--test-command FindPackageTest)
|
||||
|
||||
ADD_TEST(SystemInformation ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/SystemInformation"
|
||||
"${CMake_BINARY_DIR}/Tests/SystemInformation"
|
||||
--build-two-config
|
||||
|
@ -424,7 +419,7 @@ IF(BUILD_TESTING)
|
|||
--test-command DumpInformation)
|
||||
|
||||
ADD_TEST(StringFileTest ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/StringFileTest"
|
||||
"${CMake_BINARY_DIR}/Tests/StringFileTest"
|
||||
--build-two-config
|
||||
|
@ -434,7 +429,7 @@ IF(BUILD_TESTING)
|
|||
--test-command StringFileTest)
|
||||
|
||||
ADD_TEST(MathTest ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/MathTest"
|
||||
"${CMake_BINARY_DIR}/Tests/MathTest"
|
||||
--build-two-config
|
||||
|
@ -454,7 +449,7 @@ IF(BUILD_TESTING)
|
|||
--test-command TryCompile)
|
||||
|
||||
ADD_TEST(simple ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/Simple"
|
||||
"${CMake_BINARY_DIR}/Tests/Simple"
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
|
@ -464,29 +459,29 @@ IF(BUILD_TESTING)
|
|||
--test-command simple)
|
||||
|
||||
# ADD_TEST(SameName ${CMAKE_CTEST_COMMAND}
|
||||
# --build-and-test
|
||||
# --build-and-test
|
||||
# "${CMake_SOURCE_DIR}/Tests/SameName"
|
||||
# "${CMake_BINARY_DIR}/Tests/SameName"
|
||||
# --build-generator ${CMAKE_TEST_GENERATOR}
|
||||
# --build-project SameName
|
||||
# --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
# --build-two-config
|
||||
# --test-command
|
||||
# --test-command
|
||||
# "${CMake_BINARY_DIR}/Tests/SameName/Exe1/mytest2")
|
||||
|
||||
ADD_TEST(OutOfSource ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/OutOfSource"
|
||||
"${CMake_BINARY_DIR}/Tests/OutOfSource"
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-project OutOfSource
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--build-two-config
|
||||
--test-command
|
||||
--test-command
|
||||
"${CMake_BINARY_DIR}/Tests/OutOfSource/SubDir/OutOfSourceSubdir/simple")
|
||||
|
||||
ADD_TEST(PreOrder ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/PreOrder"
|
||||
"${CMake_BINARY_DIR}/Tests/PreOrder"
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
|
@ -496,7 +491,7 @@ IF(BUILD_TESTING)
|
|||
--test-command simple)
|
||||
|
||||
ADD_TEST(conly ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/COnly"
|
||||
"${CMake_BINARY_DIR}/Tests/COnly"
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
|
@ -506,19 +501,19 @@ IF(BUILD_TESTING)
|
|||
--test-command conly)
|
||||
|
||||
ADD_TEST(MacroTest ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/MacroTest"
|
||||
"${CMake_BINARY_DIR}/Tests/MacroTest"
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-project littleMacroTest
|
||||
--build-project littleMacroTest
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--build-two-config
|
||||
--test-command miniMacroTest)
|
||||
|
||||
SET(SimpleInstallInstallDir
|
||||
SET(SimpleInstallInstallDir
|
||||
"${CMake_BINARY_DIR}/Tests/SimpleInstall/InstallDirectory")
|
||||
ADD_TEST(SimpleInstall ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/SimpleInstall"
|
||||
"${CMake_BINARY_DIR}/Tests/SimpleInstall"
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
|
@ -529,7 +524,7 @@ IF(BUILD_TESTING)
|
|||
"-DCMAKE_INSTALL_PREFIX:PATH=${SimpleInstallInstallDir}"
|
||||
--test-command ${SimpleInstallInstallDir}/MyTest/bin/SimpleInstallExe)
|
||||
ADD_TEST(SimpleInstall-Stage2 ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/SimpleInstallS2"
|
||||
"${CMake_BINARY_DIR}/Tests/SimpleInstallS2"
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
|
@ -542,7 +537,7 @@ IF(BUILD_TESTING)
|
|||
--test-command ${SimpleInstallInstallDir}/MyTest/bin/SimpleInstallS2)
|
||||
|
||||
ADD_TEST(X11 ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/X11"
|
||||
"${CMake_BINARY_DIR}/Tests/X11"
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
|
@ -552,7 +547,7 @@ IF(BUILD_TESTING)
|
|||
--test-command UseX11)
|
||||
|
||||
ADD_TEST(LoadedCommand ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/LoadCommand"
|
||||
"${CMake_BINARY_DIR}/Tests/LoadCommand"
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
|
@ -562,13 +557,13 @@ IF(BUILD_TESTING)
|
|||
--test-command LoadedCommand)
|
||||
|
||||
ADD_TEST(LoadedCommandOneConfig ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/LoadCommandOneConfig"
|
||||
"${CMake_BINARY_DIR}/Tests/LoadCommandOneConfig"
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-project LoadedCommand
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--test-command LoadedCommand
|
||||
--test-command LoadedCommand
|
||||
)
|
||||
|
||||
# Como does not seem to support shared libraries.
|
||||
|
@ -578,17 +573,17 @@ IF(BUILD_TESTING)
|
|||
ENDIF(CMAKE_BASE_NAME MATCHES "^como$")
|
||||
IF(NOT COMPILER_IS_COMO)
|
||||
ADD_TEST(complex ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/Complex"
|
||||
"${CMake_BINARY_DIR}/Tests/Complex"
|
||||
--build-two-config
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-project complex
|
||||
--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
|
||||
-DCMAKE_TEST_DIFFERENT_GENERATOR:BOOL=${CMAKE_TEST_DIFFERENT_GENERATOR}
|
||||
--test-command complex
|
||||
--test-command complex
|
||||
)
|
||||
|
||||
ADD_TEST(complexOneConfig ${CMAKE_CTEST_COMMAND}
|
||||
|
@ -598,7 +593,7 @@ IF(BUILD_TESTING)
|
|||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-project complex
|
||||
--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
|
||||
-DCMAKE_TEST_DIFFERENT_GENERATOR:BOOL=${CMAKE_TEST_DIFFERENT_GENERATOR}
|
||||
--test-command complex)
|
||||
|
@ -610,7 +605,7 @@ IF(BUILD_TESTING)
|
|||
# --build-generator ${CMAKE_TEST_GENERATOR}
|
||||
# --build-project complex
|
||||
# --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
# --build-exe-dir "${CMake_BINARY_DIR}/Tests/ComplexRelativePaths/bin"
|
||||
# --build-exe-dir "${CMake_BINARY_DIR}/Tests/ComplexRelativePaths/bin"
|
||||
# --build-options -DCMAKE_USE_RELATIVE_PATHS:BOOL=ON
|
||||
# --test-command complex)
|
||||
|
||||
|
@ -628,50 +623,50 @@ IF(BUILD_TESTING)
|
|||
)
|
||||
|
||||
ADD_TEST(TutorialStep1 ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/Tutorial/Step1"
|
||||
"${CMake_BINARY_DIR}/Tests/Tutorial/Step1"
|
||||
--build-two-config
|
||||
--build-two-config
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--build-project Tutorial
|
||||
--test-command Tutorial 25.0)
|
||||
|
||||
ADD_TEST(TutorialStep2 ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/Tutorial/Step2"
|
||||
"${CMake_BINARY_DIR}/Tests/Tutorial/Step2"
|
||||
--build-two-config
|
||||
--build-two-config
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--build-project Tutorial
|
||||
--test-command Tutorial 25.0)
|
||||
|
||||
ADD_TEST(TutorialStep3 ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/Tutorial/Step3"
|
||||
"${CMake_BINARY_DIR}/Tests/Tutorial/Step3"
|
||||
--build-two-config
|
||||
--build-two-config
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--build-project Tutorial
|
||||
--test-command Tutorial 25.0)
|
||||
|
||||
ADD_TEST(TutorialStep4 ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/Tutorial/Step4"
|
||||
"${CMake_BINARY_DIR}/Tests/Tutorial/Step4"
|
||||
--build-two-config
|
||||
--build-two-config
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--build-project Tutorial
|
||||
--test-command Tutorial 25.0)
|
||||
|
||||
ADD_TEST(TutorialStep5 ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/Tutorial/Step5"
|
||||
"${CMake_BINARY_DIR}/Tests/Tutorial/Step5"
|
||||
--build-two-config
|
||||
--build-two-config
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--build-project Tutorial
|
||||
|
@ -757,7 +752,7 @@ IF(BUILD_TESTING)
|
|||
"${CMake_SOURCE_DIR}/Tests/Dependency"
|
||||
"${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut"
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut/Exec"
|
||||
--build-project Dependency
|
||||
--build-project Dependency
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--build-options
|
||||
|
@ -773,18 +768,18 @@ IF(BUILD_TESTING)
|
|||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Dependency/WOLibOut/Exec"
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--build-project Dependency
|
||||
--build-project Dependency
|
||||
--test-command exec
|
||||
)
|
||||
|
||||
ADD_TEST(dependency2 ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/Dependency"
|
||||
"${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut"
|
||||
"${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut"
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut/Exec2"
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--build-project Dependency
|
||||
--build-project Dependency
|
||||
--build-options
|
||||
-DLIBRARY_OUTPUT_PATH:PATH=${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut/Lib
|
||||
--test-command exec2
|
||||
|
@ -797,7 +792,7 @@ IF(BUILD_TESTING)
|
|||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut/Exec3"
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--build-project Dependency
|
||||
--build-project Dependency
|
||||
--build-options
|
||||
-DLIBRARY_OUTPUT_PATH:PATH=${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut/Lib
|
||||
--test-command exec3)
|
||||
|
@ -809,7 +804,7 @@ IF(BUILD_TESTING)
|
|||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut/Exec4"
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--build-project Dependency
|
||||
--build-project Dependency
|
||||
--build-options
|
||||
-DLIBRARY_OUTPUT_PATH:PATH=${CMake_BINARY_DIR}/Tests/Dependency/WithLibOut/Lib
|
||||
--test-command exec4
|
||||
|
@ -834,7 +829,7 @@ IF(BUILD_TESTING)
|
|||
"${CMake_BINARY_DIR}/Tests/Jump/NoLibOut"
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/Jump/NoLibOut/Executable"
|
||||
--build-run-dir "${CMake_BINARY_DIR}/Tests/Jump/NoLibOut/Executable"
|
||||
--build-project Jump
|
||||
--build-project Jump
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--test-command jumpExecutable
|
||||
|
@ -854,7 +849,7 @@ IF(BUILD_TESTING)
|
|||
ADD_TEST(linkorder1 ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/LinkLineOrder"
|
||||
"${CMake_BINARY_DIR}/Tests/LinkLineOrder"
|
||||
"${CMake_BINARY_DIR}/Tests/LinkLineOrder"
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--build-exe-dir "${CMake_BINARY_DIR}/Tests/LinkLineOrder"
|
||||
|
@ -907,7 +902,7 @@ IF(BUILD_TESTING)
|
|||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--build-project SUBDIR
|
||||
--test-command test
|
||||
--test-command test
|
||||
"${CMake_BINARY_DIR}/Tests/SubDir/ShouldBeHere"
|
||||
"${CMake_BINARY_DIR}/Tests/SubDir/testfromsubdir.obj"
|
||||
)
|
||||
|
@ -920,11 +915,11 @@ IF(BUILD_TESTING)
|
|||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--build-project SUBDIR
|
||||
--test-command test
|
||||
--test-command test
|
||||
"${CMake_BINARY_DIR}/Tests/SubDir/ShouldBeHere"
|
||||
"${CMake_BINARY_DIR}/Tests/SubDir/testfromsubdir.o"
|
||||
)
|
||||
ENDIF (WIN32)
|
||||
ENDIF (WIN32)
|
||||
|
||||
IF("${CMAKE_TEST_GENERATOR}" MATCHES "Makefile")
|
||||
ADD_TEST(MakeClean ${CMAKE_CTEST_COMMAND}
|
||||
|
@ -941,7 +936,7 @@ IF(BUILD_TESTING)
|
|||
|
||||
IF(${CMAKE_TEST_GENERATOR} MATCHES "Visual Studio")
|
||||
ADD_TEST(VSExternalInclude ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/VSExternalInclude"
|
||||
"${CMake_BINARY_DIR}/Tests/VSExternalInclude"
|
||||
--build-two-config
|
||||
|
@ -952,7 +947,7 @@ IF(BUILD_TESTING)
|
|||
ENDIF(${CMAKE_TEST_GENERATOR} MATCHES "Visual Studio")
|
||||
|
||||
IF (APPLE AND CMAKE_COMPILER_IS_GNUCXX)
|
||||
SET(BundleTestInstallDir
|
||||
SET(BundleTestInstallDir
|
||||
"${CMake_BINARY_DIR}/Tests/BundleTest/InstallDirectory")
|
||||
ADD_TEST(BundleTest ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
|
@ -967,7 +962,7 @@ IF(BUILD_TESTING)
|
|||
--build-options "-DCMAKE_INSTALL_PREFIX:PATH=${BundleTestInstallDir}"
|
||||
--test-command
|
||||
${BundleTestInstallDir}/Application/BundleTestExe.app/Contents/MacOS/BundleTestExe)
|
||||
|
||||
|
||||
ADD_TEST(objc++ ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/ObjC++"
|
||||
|
@ -1012,26 +1007,26 @@ IF(BUILD_TESTING)
|
|||
--build-and-test
|
||||
${CMake_SOURCE_DIR}
|
||||
${CMake_BINARY_DIR}/Tests/BootstrapTest
|
||||
--build-nocmake
|
||||
--build-nocmake
|
||||
--build-noclean
|
||||
--build-makeprogram ${CMake_SOURCE_DIR}/bootstrap
|
||||
--build-generator "${CMAKE_TEST_GENERATOR}"
|
||||
--test-command ${CMake_BINARY_DIR}/Tests/BootstrapTest/Bootstrap.cmk/cmake)
|
||||
ENDIF(UNIX AND CMAKE_RUN_LONG_TESTS AND NOT CMAKE_SKIP_BOOTSTRAP_TEST)
|
||||
|
||||
# fortran does not work for IDE builds because
|
||||
# fortran does not work for IDE builds because
|
||||
# CMAKE_STANDARD_LIBRARIES needs to be per language
|
||||
IF(CMAKE_TEST_GENERATOR MATCHES "Makefiles")
|
||||
# see if we can find a fortran compiler on the machine
|
||||
# if so, add the fortran test and see if it works.
|
||||
SET(CMAKE_Fortran_COMPILER_LIST ifort ifc efc f95 pgf95
|
||||
lf95 xlf95 fort gfortran f90 pgf90 xlf90
|
||||
SET(CMAKE_Fortran_COMPILER_LIST ifort ifc efc f95 pgf95
|
||||
lf95 xlf95 fort gfortran f90 pgf90 xlf90
|
||||
epcf90 f77 fort77 frt pgf77 xlf fl32 af77 g77 )
|
||||
FIND_PROGRAM(CMAKE_Fortran_COMPILER_FULLPATH NAMES ${CMAKE_Fortran_COMPILER_LIST} )
|
||||
MARK_AS_ADVANCED(CMAKE_Fortran_COMPILER_FULLPATH)
|
||||
IF(CMAKE_Fortran_COMPILER_FULLPATH)
|
||||
ADD_TEST(Fortran ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/Fortran"
|
||||
"${CMake_BINARY_DIR}/Tests/Fortran"
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
|
@ -1052,21 +1047,21 @@ IF(BUILD_TESTING)
|
|||
FILE(READ "${JNI_H}" JNI_FILE)
|
||||
IF("${JNI_FILE}" MATCHES "JDK1_2")
|
||||
ADD_TEST(Java ${CMAKE_CTEST_COMMAND}
|
||||
--build-and-test
|
||||
--build-and-test
|
||||
"${CMake_SOURCE_DIR}/Tests/Java"
|
||||
"${CMake_BINARY_DIR}/Tests/Java"
|
||||
--build-generator ${CMAKE_TEST_GENERATOR}
|
||||
--build-project hello
|
||||
--build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
|
||||
--build-two-config
|
||||
--build-two-config
|
||||
--build-run-dir "${CMake_BINARY_DIR}/Tests/Java/"
|
||||
--test-command ${JAVA_RUNTIME} -classpath hello.jar HelloWorld)
|
||||
ENDIF("${JNI_FILE}" MATCHES "JDK1_2")
|
||||
ENDIF(JNI_H)
|
||||
ENDIF(JNI_H)
|
||||
ENDIF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE AND NOT MINGW)
|
||||
ENDIF(NOT CMAKE_TEST_GENERATOR MATCHES "Xcode")
|
||||
|
||||
|
||||
|
||||
|
||||
IF (CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE OR WXWINDOWS_INCLUDE_DIR)
|
||||
# Will be set if the wxwindows gui is on
|
||||
ADD_TEST(UseWX ${CMAKE_CTEST_COMMAND}
|
||||
|
|
Loading…
Reference in New Issue