[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.7 1.8 InitialCache.cmake.in NONE 1.1
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Jul 14 08:38:28 EDT 2009
Update of /cvsroot/CMake/CMake/Tests/ExportImport
In directory public:/mounts/ram/cvs-serv1995/Tests/ExportImport
Modified Files:
CMakeLists.txt
Added Files:
InitialCache.cmake.in
Log Message:
COMP: Shorten ExportImport test command lines
The ExportImport test drives its Export and Import projects using the
same compiler and flags. This converts the ctest --build-and-test
command lines to use an initial cache file instead of passing all
settings on the command line.
We need a shorter command line to pass through VS 6 on Win98.
This approach reduces duplicate code anyway.
--- NEW FILE: InitialCache.cmake.in ---
SET(CMAKE_C_COMPILER "@CMAKE_C_COMPILER@" CACHE STRING "C Compiler")
SET(CMAKE_C_FLAGS "@CMAKE_C_FLAGS@" CACHE STRING "C Flags")
SET(CMAKE_C_FLAGS_DEBUG "@CMAKE_C_FLAGS_DEBUG@" CACHE STRING "C Flags")
SET(CMAKE_C_FLAGS_RELEASE "@CMAKE_C_FLAGS_RELEASE@" CACHE STRING "C Flags")
SET(CMAKE_C_FLAGS_MINSIZEREL "@CMAKE_C_FLAGS_MINSIZEREL@" CACHE STRING "C Flags")
SET(CMAKE_C_FLAGS_RELWITHDEBINFO "@CMAKE_C_FLAGS_RELWITHDEBINFO@" CACHE STRING "C Flags")
SET(CMAKE_CXX_COMPILER "@CMAKE_CXX_COMPILER@" CACHE STRING "C++ Compiler")
SET(CMAKE_CXX_FLAGS "@CMAKE_CXX_FLAGS@" CACHE STRING "C++ Flags")
SET(CMAKE_CXX_FLAGS_DEBUG "@CMAKE_CXX_FLAGS_DEBUG@" CACHE STRING "C++ Flags")
SET(CMAKE_CXX_FLAGS_RELEASE "@CMAKE_CXX_FLAGS_RELEASE@" CACHE STRING "C++ Flags")
SET(CMAKE_CXX_FLAGS_MINSIZEREL "@CMAKE_CXX_FLAGS_MINSIZEREL@" CACHE STRING "C++ Flags")
SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "@CMAKE_CXX_FLAGS_RELWITHDEBINFO@" CACHE STRING "C++ Flags")
SET(CMAKE_INSTALL_PREFIX "@ExportImport_BINARY_DIR@/Root" CACHE STRING "Installation Prefix")
SET(CMAKE_SKIP_RPATH ON CACHE BOOL "No RPATH")
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExportImport/CMakeLists.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** CMakeLists.txt 11 Jul 2009 14:10:46 -0000 1.7
--- CMakeLists.txt 14 Jul 2009 12:38:23 -0000 1.8
***************
*** 23,40 ****
endif(CMAKE_CONFIGURATION_TYPES)
! set(SAME_COMPILER
! -DCMAKE_C_COMPILER:STRING=${CMAKE_C_COMPILER}
! -DCMAKE_C_FLAGS:STRING=${CMAKE_C_FLAGS}
! -DCMAKE_C_FLAGS_DEBUG:STRING=${CMAKE_C_FLAGS_DEBUG}
! -DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELEASE}
! -DCMAKE_C_FLAGS_MINSIZEREL:STRING=${CMAKE_C_FLAGS_MINSIZEREL}
! -DCMAKE_C_FLAGS_RELWITHDEBINFO:STRING=${CMAKE_C_FLAGS_RELWITHDEBINFO}
! -DCMAKE_CXX_COMPILER:STRING=${CMAKE_CXX_COMPILER}
! -DCMAKE_CXX_FLAGS:STRING=${CMAKE_CXX_FLAGS}
! -DCMAKE_CXX_FLAGS_DEBUG:STRING=${CMAKE_CXX_FLAGS_DEBUG}
! -DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELEASE}
! -DCMAKE_CXX_FLAGS_MINSIZEREL:STRING=${CMAKE_CXX_FLAGS_MINSIZEREL}
! -DCMAKE_CXX_FLAGS_RELWITHDEBINFO:STRING=${CMAKE_CXX_FLAGS_RELWITHDEBINFO}
! )
# Build and install the exporter.
--- 23,28 ----
endif(CMAKE_CONFIGURATION_TYPES)
! configure_file(${ExportImport_SOURCE_DIR}/InitialCache.cmake.in
! ${ExportImport_BINARY_DIR}/InitialCache.cmake @ONLY)
# Build and install the exporter.
***************
*** 50,57 ****
--build-generator ${CMAKE_GENERATOR}
--build-makeprogram ${CMAKE_MAKE_PROGRAM}
! --build-options ${SAME_COMPILER}
! -DCMAKE_INSTALL_PREFIX:STRING=${ExportImport_BINARY_DIR}/Root
! -DCMAKE_SKIP_RPATH:BOOL=ON
! )
add_custom_target(ExportTarget ALL DEPENDS ${ExportImport_BINARY_DIR}/ExportProject)
add_dependencies(ExportTarget CleanupTarget)
--- 38,43 ----
--build-generator ${CMAKE_GENERATOR}
--build-makeprogram ${CMAKE_MAKE_PROGRAM}
! --build-options -C${ExportImport_BINARY_DIR}/InitialCache.cmake
! )
add_custom_target(ExportTarget ALL DEPENDS ${ExportImport_BINARY_DIR}/ExportProject)
add_dependencies(ExportTarget CleanupTarget)
***************
*** 72,79 ****
--build-generator ${CMAKE_GENERATOR}
--build-makeprogram ${CMAKE_MAKE_PROGRAM}
! --build-options ${SAME_COMPILER}
! -DCMAKE_INSTALL_PREFIX:STRING=${ExportImport_BINARY_DIR}/Root
! -DCMAKE_SKIP_RPATH:BOOL=ON
! )
add_custom_target(ImportTarget ALL DEPENDS ${ExportImport_BINARY_DIR}/ImportProject)
add_dependencies(ImportTarget ExportTarget)
--- 58,63 ----
--build-generator ${CMAKE_GENERATOR}
--build-makeprogram ${CMAKE_MAKE_PROGRAM}
! --build-options -C${ExportImport_BINARY_DIR}/InitialCache.cmake
! )
add_custom_target(ImportTarget ALL DEPENDS ${ExportImport_BINARY_DIR}/ImportProject)
add_dependencies(ImportTarget ExportTarget)
More information about the Cmake-commits
mailing list