[Cmake-commits] [cmake-commits] king committed CMakeLists.txt 1.6 1.7

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/ExportImport
In directory public:/mounts/ram/cvs-serv18572/Tests/ExportImport

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Test export/import of link interface languages

This extends the ExportImport test.  The Export project creates a C++
static library and exports it.  Then the Import project links the
library into a C executable.  On most platforms the executable will link
only if the C++ linker is chosen correctly.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExportImport/CMakeLists.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C 2 -d -r1.6 -r1.7
*** CMakeLists.txt	25 Mar 2008 15:26:50 -0000	1.6
--- CMakeLists.txt	11 Jul 2009 14:10:46 -0000	1.7
***************
*** 1,4 ****
! cmake_minimum_required (VERSION 2.6)
! project(ExportImport C)
  
  # Wipe out the install tree to make sure the exporter works.
--- 1,4 ----
! cmake_minimum_required (VERSION 2.7.20090711)
! project(ExportImport C CXX)
  
  # Wipe out the install tree to make sure the exporter works.
***************
*** 23,26 ****
--- 23,41 ----
  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.
  add_custom_command(
***************
*** 35,45 ****
      --build-generator ${CMAKE_GENERATOR}
      --build-makeprogram ${CMAKE_MAKE_PROGRAM}
!     --build-options
!       -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_INSTALL_PREFIX:STRING=${ExportImport_BINARY_DIR}/Root
        -DCMAKE_SKIP_RPATH:BOOL=ON
--- 50,54 ----
      --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
***************
*** 63,73 ****
     --build-generator ${CMAKE_GENERATOR}
     --build-makeprogram ${CMAKE_MAKE_PROGRAM}
!    --build-options
!      -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_INSTALL_PREFIX:STRING=${ExportImport_BINARY_DIR}/Root
       -DCMAKE_SKIP_RPATH:BOOL=ON
--- 72,76 ----
     --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