[cmake-commits] king committed CMakeLists.txt 1.3 1.4

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Jan 30 17:26:11 EST 2008


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

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: Updated ExportImport test to try LINK_INTERFACE_LIBRARIES.


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/ExportImport/CMakeLists.txt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- CMakeLists.txt	29 Jan 2008 13:03:43 -0000	1.3
+++ CMakeLists.txt	30 Jan 2008 22:26:09 -0000	1.4
@@ -11,15 +11,20 @@
   PROPERTY SYMBOLIC 1
   )
 
-# Build and install the exporter.
 if(CMAKE_CONFIGURATION_TYPES)
-  set(Export_CONFIG_TYPE -C "${CMAKE_CFG_INTDIR}")
+  set(NESTED_CONFIG_TYPE -C "${CMAKE_CFG_INTDIR}")
 else(CMAKE_CONFIGURATION_TYPES)
-  set(Export_CONFIG_TYPE)
+  if(CMAKE_BUILD_TYPE)
+    set(NESTED_CONFIG_TYPE -C "${CMAKE_BUILD_TYPE}")
+  else(CMAKE_BUILD_TYPE)
+    set(NESTED_CONFIG_TYPE)
+  endif(CMAKE_BUILD_TYPE)
 endif(CMAKE_CONFIGURATION_TYPES)
+
+# Build and install the exporter.
 add_custom_command(
   OUTPUT ${ExportImport_BINARY_DIR}/ExportProject
-  COMMAND ${CMAKE_CTEST_COMMAND} ${Export_CONFIG_TYPE}
+  COMMAND ${CMAKE_CTEST_COMMAND} ${NESTED_CONFIG_TYPE}
     --build-and-test
     ${ExportImport_SOURCE_DIR}/Export
     ${ExportImport_BINARY_DIR}/Export
@@ -45,14 +50,9 @@
   )
 
 # Build and install the importer.
-if(CMAKE_CONFIGURATION_TYPES)
-  set(Import_CONFIG_TYPE -C "${CMAKE_CFG_INTDIR}")
-else(CMAKE_CONFIGURATION_TYPES)
-  set(Import_CONFIG_TYPE)
-endif(CMAKE_CONFIGURATION_TYPES)
 add_custom_command(
   OUTPUT ${ExportImport_BINARY_DIR}/ImportProject
-  COMMAND ${CMAKE_CTEST_COMMAND} ${Import_CONFIG_TYPE}
+  COMMAND ${CMAKE_CTEST_COMMAND} ${NESTED_CONFIG_TYPE}
    --build-and-test
    ${ExportImport_SOURCE_DIR}/Import
    ${ExportImport_BINARY_DIR}/Import



More information about the Cmake-commits mailing list