GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-09-16 19:33:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Force release builds on Windows machines in the test suite.

Browse Source 
Added an IGNORE_CVS flag to the test suite (allows submitting local and modified repositories).
Fixed the EI_OFLAG for MSVC.
This commit is contained in:
John Smith 2009-08-28 20:14:18 +02:00
parent 227f6cbce0
commit aacada1662
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/EigenTesting.cmake
View File

@ -160,11 +160,9 @@ if(CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g2") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O0 -g2")
endif(CMAKE_SYSTEM_NAME MATCHES Linux) endif(CMAKE_SYSTEM_NAME MATCHES Linux)
set(EI_OFLAG "-O2") set(EI_OFLAG "-O2")
# MSVC fails with: elseif(MSVC)
# cl : Command line warning D9025 : overriding '/Od' with '/O2' set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /MDd /Zi /Ob0 /Od" CACHE STRING "Flags used by the compiler during debug builds." FORCE)
# cl : Command line error D8016 : '/RTC1' and '/O2' command-line options are incompatible set(EI_OFLAG "/O2")
# elseif(MSVC)
# set(EI_OFLAG "/O2")
else(CMAKE_COMPILER_IS_GNUCXX) else(CMAKE_COMPILER_IS_GNUCXX)
set(EI_OFLAG "") set(EI_OFLAG "")
endif(CMAKE_COMPILER_IS_GNUCXX) endif(CMAKE_COMPILER_IS_GNUCXX)

16
test/testsuite.cmake
View File

@ -132,8 +132,11 @@ endif(NOT EIGEN_MODE)
## mandatory variables (the default should be ok in most cases): ## mandatory variables (the default should be ok in most cases):
SET (CTEST_CVS_COMMAND "hg") if(NOT IGNORE_CVS)
SET (CTEST_CVS_CHECKOUT "${CTEST_CVS_COMMAND} clone http://bitbucket.org/eigen/eigen2 \"${CTEST_SOURCE_DIRECTORY}\"") SET (CTEST_CVS_COMMAND "hg")
SET (CTEST_CVS_CHECKOUT "${CTEST_CVS_COMMAND} clone http://bitbucket.org/eigen/eigen2 \"${CTEST_SOURCE_DIRECTORY}\"")
SET(CTEST_BACKUP_AND_RESTORE TRUE) # the backup is CVS related ...
endif(NOT IGNORE_CVS)
# which ctest command to use for running the dashboard # which ctest command to use for running the dashboard
SET (CTEST_COMMAND "${EIGEN_CMAKE_DIR}ctest -D ${EIGEN_MODE}") SET (CTEST_COMMAND "${EIGEN_CMAKE_DIR}ctest -D ${EIGEN_MODE}")
@ -150,7 +153,6 @@ SET($ENV{LC_MESSAGES} "en_EN")
# should ctest wipe the binary tree before running # should ctest wipe the binary tree before running
SET(CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE) SET(CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)
SET(CTEST_BACKUP_AND_RESTORE TRUE)
# this is the initial cache to use for the binary tree, be careful to escape # this is the initial cache to use for the binary tree, be careful to escape
# any quotes inside of this string if you use it # any quotes inside of this string if you use it
@ -160,7 +162,8 @@ if(WIN32 AND NOT UNIX)
SET (CTEST_INITIAL_CACHE " SET (CTEST_INITIAL_CACHE "
MAKECOMMAND:STRING=nmake -i MAKECOMMAND:STRING=nmake -i
CMAKE_MAKE_PROGRAM:FILEPATH=nmake CMAKE_MAKE_PROGRAM:FILEPATH=nmake
CMAKE_GENERATOR:INTERNAL=NMake Makefiles CMAKE_GENERATOR:INTERNAL=NMake Makefiles
CMAKE_BUILD_TYPE:STRING=Release
BUILDNAME:STRING=${EIGEN_BUILD_STRING} BUILDNAME:STRING=${EIGEN_BUILD_STRING}
SITE:STRING=${EIGEN_SITE} SITE:STRING=${EIGEN_SITE}
") ")
@ -172,10 +175,11 @@ else(WIN32 AND NOT UNIX)
endif(WIN32 AND NOT UNIX) endif(WIN32 AND NOT UNIX)
# set any extra environment variables to use during the execution of the script here: # set any extra environment variables to use during the execution of the script here:
# setting this variable on windows machines causes trouble ...
if(EIGEN_CXX) if(EIGEN_CXX AND NOT WIN32)
set(CTEST_ENVIRONMENT "CXX=${EIGEN_CXX}") set(CTEST_ENVIRONMENT "CXX=${EIGEN_CXX}")
endif(EIGEN_CXX) endif(EIGEN_CXX AND NOT WIN32)
if(DEFINED EIGEN_EXPLICIT_VECTORIZATION) if(DEFINED EIGEN_EXPLICIT_VECTORIZATION)
if(EIGEN_EXPLICIT_VECTORIZATION MATCHES SSE2) if(EIGEN_EXPLICIT_VECTORIZATION MATCHES SSE2)