[cmake-commits] king committed CMakeLists.txt 1.327 1.328
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Feb 8 16:18:23 EST 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv13172/Source
Modified Files:
CMakeLists.txt
Log Message:
ENH: Added PrecompiledHeader test for MSVC compilers.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CMakeLists.txt,v
retrieving revision 1.327
retrieving revision 1.328
diff -u -d -r1.327 -r1.328
--- CMakeLists.txt 5 Feb 2007 16:13:18 -0000 1.327
+++ CMakeLists.txt 8 Feb 2007 21:18:21 -0000 1.328
@@ -367,6 +367,18 @@
SET(CMAKE_TEST_DIFFERENT_GENERATOR TRUE)
ENDIF(NOT CMAKE_TEST_GENERATOR)
+ # Are we testing with the MSVC compiler?
+ SET(CMAKE_TEST_MSVC 0)
+ IF(MSVC AND NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+ SET(CMAKE_TEST_MSVC 1)
+ ELSE(MSVC AND NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+ IF("${CMAKE_TEST_GENERATOR}" MATCHES "NMake" OR
+ "${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio")
+ SET(CMAKE_TEST_MSVC 1)
+ ENDIF("${CMAKE_TEST_GENERATOR}" MATCHES "NMake" OR
+ "${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio")
+ ENDIF(MSVC AND NOT CMAKE_TEST_DIFFERENT_GENERATOR)
+
SET(CMAKE_TEST_SYSTEM_LIBRARIES 0)
FOREACH(util CURL EXPAT XMLRPC ZLIB)
IF(CMAKE_USE_SYSTEM_${util})
@@ -1008,6 +1020,18 @@
)
ENDIF (WIN32)
+ IF(CMAKE_TEST_MSVC)
+ ADD_TEST(PrecompiledHeader ${CMAKE_CTEST_COMMAND}
+ --build-and-test
+ "${CMake_SOURCE_DIR}/Tests/PrecompiledHeader"
+ "${CMake_BINARY_DIR}/Tests/PrecompiledHeader"
+ --build-generator ${CMAKE_TEST_GENERATOR}
+ --build-project PrecompiledHeader
+ --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+ --build-two-config
+ --test-command foo)
+ ENDIF(CMAKE_TEST_MSVC)
+
IF("${CMAKE_TEST_GENERATOR}" MATCHES "Makefile")
ADD_TEST(MakeClean ${CMAKE_CTEST_COMMAND}
--build-and-test
More information about the Cmake-commits
mailing list