ENH: Add support for multi-string compiler name, and improve support for subversion
This commit is contained in:
parent
6a73e8ac69
commit
5b26fefd60
|
@ -36,6 +36,8 @@ CMAKE_CXX_FLAGS:STRING=@CMAKE_CXX_FLAGS@
|
||||||
CMAKE_C_FLAGS:STRING=@CMAKE_C_FLAGS@
|
CMAKE_C_FLAGS:STRING=@CMAKE_C_FLAGS@
|
||||||
CMAKE_C_COMPILER:STRING=@CMAKE_C_COMPILER@
|
CMAKE_C_COMPILER:STRING=@CMAKE_C_COMPILER@
|
||||||
CMAKE_CXX_COMPILER:STRING=@CMAKE_CXX_COMPILER@
|
CMAKE_CXX_COMPILER:STRING=@CMAKE_CXX_COMPILER@
|
||||||
|
CMAKE_C_COMPILER_ARG1:STRING=@CMAKE_C_COMPILER_ARG1@
|
||||||
|
CMAKE_CXX_COMPILER_ARG1:STRING=@CMAKE_CXX_COMPILER_ARG1@
|
||||||
|
|
||||||
# This one is needed for testing advanced ctest features
|
# This one is needed for testing advanced ctest features
|
||||||
CTEST_TEST_KWSYS:BOOL=ON
|
CTEST_TEST_KWSYS:BOOL=ON
|
||||||
|
@ -51,47 +53,51 @@ CTEST_COVERAGE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
|
||||||
CTEST_SUBMIT(RETURN_VALUE res)
|
CTEST_SUBMIT(RETURN_VALUE res)
|
||||||
|
|
||||||
SET(svncommand "@SVNCOMMAND@")
|
SET(svncommand "@SVNCOMMAND@")
|
||||||
IF("${svncommand}")
|
IF(svncommand)
|
||||||
# Project 2
|
# Project 2
|
||||||
PROJECT_START("KWSys from SVN")
|
PROJECT_START("KWSys from SVN")
|
||||||
|
|
||||||
# Settings:
|
# Settings:
|
||||||
SET(CTEST_DASHBOARD_ROOT "@CMake_BINARY_DIR@/Tests/CTestTest3")
|
SET(CTEST_DASHBOARD_ROOT "@CMake_BINARY_DIR@/Tests/CTestTest3")
|
||||||
SET(CTEST_SITE "@SITE@")
|
SET(CTEST_SITE "@SITE@")
|
||||||
SET(CTEST_BUILD_NAME "KWSys-@BUILDNAME@-CTest3-SVN")
|
SET(CTEST_BUILD_NAME "KWSys-@BUILDNAME@-CTest3-SVN")
|
||||||
|
|
||||||
# ---
|
# ---
|
||||||
SET(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/SVN/kwsys")
|
SET(CTEST_SOURCE_DIRECTORY "${CTEST_DASHBOARD_ROOT}/SVN/kwsys")
|
||||||
SET(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/SVN/kwsysBin")
|
SET(CTEST_BINARY_DIRECTORY "${CTEST_DASHBOARD_ROOT}/SVN/kwsysBin")
|
||||||
SET(CTEST_UPDATE_COMMAND "@SVNCOMMAND@")
|
SET(CTEST_UPDATE_COMMAND "@SVNCOMMAND@")
|
||||||
SET(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
|
SET(CTEST_CMAKE_GENERATOR "@CMAKE_GENERATOR@")
|
||||||
SET(CTEST_BUILD_CONFIGURATION "Release")
|
SET(CTEST_BUILD_CONFIGURATION "Release")
|
||||||
SET(CTEST_MEMORYCHECK_COMMAND "@MEMORYCHECK_COMMAND@")
|
SET(CTEST_MEMORYCHECK_COMMAND "@MEMORYCHECK_COMMAND@")
|
||||||
SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
|
SET(CTEST_MEMORYCHECK_SUPPRESSIONS_FILE "@MEMORYCHECK_SUPPRESSIONS_FILE@")
|
||||||
SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS "@MEMORYCHECK_COMMAND_OPTIONS@")
|
SET(CTEST_MEMORYCHECK_COMMAND_OPTIONS "@MEMORYCHECK_COMMAND_OPTIONS@")
|
||||||
SET(CTEST_COVERAGE_COMMAND "@COVERAGE_COMMAND@")
|
SET(CTEST_COVERAGE_COMMAND "@COVERAGE_COMMAND@")
|
||||||
SET(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
|
SET(CTEST_NOTES_FILES "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
|
||||||
SET(CTEST_CHECKOUT_COMMAND "\"${CTEST_UPDATE_COMMAND}\" co \"http://svn.na-mic.org:8000/svn/CMake/Source/kwsys/\" -r 500")
|
SET(CTEST_CHECKOUT_COMMAND "\"${CTEST_UPDATE_COMMAND}\" co \"http://svn.na-mic.org:8000/svn/CMake/Source/kwsys/\" -r 500")
|
||||||
|
|
||||||
CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
|
CTEST_EMPTY_BINARY_DIRECTORY(${CTEST_BINARY_DIRECTORY})
|
||||||
|
|
||||||
FILE(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
|
FILE(WRITE "${CTEST_BINARY_DIRECTORY}/CMakeCache.txt" "
|
||||||
CMAKE_CXX_FLAGS:STRING=@CMAKE_CXX_FLAGS@
|
CMAKE_CXX_FLAGS:STRING=@CMAKE_CXX_FLAGS@
|
||||||
CMAKE_C_FLAGS:STRING=@CMAKE_C_FLAGS@
|
CMAKE_C_FLAGS:STRING=@CMAKE_C_FLAGS@
|
||||||
CMAKE_C_COMPILER:STRING=@CMAKE_C_COMPILER@
|
CMAKE_C_COMPILER:STRING=@CMAKE_C_COMPILER@
|
||||||
CMAKE_CXX_COMPILER:STRING=@CMAKE_CXX_COMPILER@
|
CMAKE_CXX_COMPILER:STRING=@CMAKE_CXX_COMPILER@
|
||||||
|
CMAKE_C_COMPILER_ARG1:STRING=@CMAKE_C_COMPILER_ARG1@
|
||||||
|
CMAKE_CXX_COMPILER_ARG1:STRING=@CMAKE_CXX_COMPILER_ARG1@
|
||||||
|
|
||||||
# This one is needed for testing advanced ctest features
|
# This one is needed for testing advanced ctest features
|
||||||
CTEST_TEST_KWSYS:BOOL=ON
|
CTEST_TEST_KWSYS:BOOL=ON
|
||||||
")
|
")
|
||||||
|
|
||||||
CTEST_START(Experimental)
|
CTEST_START(Experimental)
|
||||||
CTEST_UPDATE(SOURCE "${CTEST_SOURCE_DIRECTORY}" RETURN_VALUE res)
|
CTEST_UPDATE(SOURCE "${CTEST_SOURCE_DIRECTORY}" RETURN_VALUE res)
|
||||||
CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
|
CTEST_CONFIGURE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
|
||||||
CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
|
CTEST_BUILD(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
|
||||||
CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
|
CTEST_TEST(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
|
||||||
CTEST_MEMCHECK(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
|
CTEST_MEMCHECK(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
|
||||||
CTEST_COVERAGE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
|
CTEST_COVERAGE(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
|
||||||
CTEST_SUBMIT(RETURN_VALUE res)
|
CTEST_SUBMIT(RETURN_VALUE res)
|
||||||
|
|
||||||
ENDIF("${svncommand}")
|
ELSE(svncommand)
|
||||||
|
MESSAGE("Cannot find SVN command: ${svncommand}")
|
||||||
|
ENDIF(svncommand)
|
||||||
|
|
Loading…
Reference in New Issue