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,7 +53,7 @@ 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")
|
||||||
|
|
||||||
|
@ -80,6 +82,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
|
||||||
|
@ -94,4 +98,6 @@ 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