Browse Source

Change cpack run and verify script to work with multi-config generators.

Use the location of the running cmake to find cpack, and use the
CMAKE_CONFIG_TYPE environtment variable as a type for cpack.
Bill Hoffman 15 years ago
parent
commit
86979e49a1
1 changed files with 10 additions and 3 deletions
  1. 10 3
      Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake

+ 10 - 3
Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake

@@ -9,7 +9,9 @@ endif(NOT CPackComponentsForAll_BINARY_DIR)
 if(NOT CPackGen)
 if(NOT CPackGen)
   message(FATAL_ERROR "CPackGen not set")
   message(FATAL_ERROR "CPackGen not set")
 endif(NOT CPackGen)
 endif(NOT CPackGen)
-
+get_filename_component(CPACK_LOCATION ${CMAKE_COMMAND} PATH)
+set(CPackCommand "${CPACK_LOCATION}/cpack")
+message("cpack = ${CPackCommand}")
 if(NOT CPackCommand)
 if(NOT CPackCommand)
   message(FATAL_ERROR "CPackCommand not set")
   message(FATAL_ERROR "CPackCommand not set")
 endif(NOT CPackCommand)
 endif(NOT CPackCommand)
@@ -24,8 +26,13 @@ set(expected_file_mask "")
 # May produce several numbers of files depending on
 # May produce several numbers of files depending on
 # CPACK_COMPONENT_xxx values
 # CPACK_COMPONENT_xxx values
 set(expected_count 1)
 set(expected_count 1)
-
-execute_process(COMMAND ${CPackCommand} -G ${CPackGen} -C Release
+set(config_type $ENV{CMAKE_CONFIG_TYPE})
+set(config_args )
+if(config_type)
+  set(config_args -C ${config_type})
+endif()
+message(" ${config_args}")
+execute_process(COMMAND ${CPackCommand} -G ${CPackGen} ${config_args}
     RESULT_VARIABLE CPack_result
     RESULT_VARIABLE CPack_result
     OUTPUT_VARIABLE CPack_output
     OUTPUT_VARIABLE CPack_output
     ERROR_VARIABLE CPack_error
     ERROR_VARIABLE CPack_error