kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'fix-cpack-tests' 

587b7b6 Tests: Use the right path to CPack value for running CPack tests
This commit is contained in:
Brad King 2012-11-30 10:36:29 -05:00 committed by CMake Topic Stage
parent d8c0a40d05 587b7b6f5e
commit ae951af859
3 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Tests/CMakeLists.txt
View File

@ -744,7 +744,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
# ACTIVE_CPACK_GENERATORS variable # ACTIVE_CPACK_GENERATORS variable
# now contains the list of 'active generators' # now contains the list of 'active generators'
set(CPackComponentsForAll_EXTRA_OPTIONS) set(CPackComponentsForAll_EXTRA_OPTIONS)
set(CPackRun_CPackCommand "-DCPackCommand=${CMAKE_CPACK_COMMAND}")
# set up list of CPack generators # set up list of CPack generators
list(APPEND GENLST "ZIP") list(APPEND GENLST "ZIP")
if(APPLE) if(APPLE)
@ -784,7 +783,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
--graphviz=CPackComponentsForAll.dot --graphviz=CPackComponentsForAll.dot
--test-command ${CMAKE_CMAKE_COMMAND} --test-command ${CMAKE_CMAKE_COMMAND}
"-DCPackComponentsForAll_BINARY_DIR:PATH=${CMake_BINARY_DIR}/Tests/CPackComponentsForAll/build${CPackGen}-${CPackComponentWay}" "-DCPackComponentsForAll_BINARY_DIR:PATH=${CMake_BINARY_DIR}/Tests/CPackComponentsForAll/build${CPackGen}-${CPackComponentWay}"
"${CPackRun_CPackCommand}"
"${CPackRun_CPackGen}" "${CPackRun_CPackGen}"
"${CPackRun_CPackComponentWay}" "${CPackRun_CPackComponentWay}"
-P "${CMake_SOURCE_DIR}/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake") -P "${CMake_SOURCE_DIR}/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake")
@ -819,7 +817,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
--test-command --test-command
${CMAKE_CMAKE_COMMAND} ${CMAKE_CMAKE_COMMAND}
-D dir=${CMake_BINARY_DIR}/Tests/CPackTestAllGenerators -D dir=${CMake_BINARY_DIR}/Tests/CPackTestAllGenerators
-D cpack=${CMAKE_CPACK_COMMAND}
-P ${CMake_SOURCE_DIR}/Tests/CPackTestAllGenerators/RunCPack.cmake -P ${CMake_SOURCE_DIR}/Tests/CPackTestAllGenerators/RunCPack.cmake
) )
list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/CPackTestAllGenerators") list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/CPackTestAllGenerators")

11
Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
View File

@ -9,11 +9,10 @@ endif()
if(NOT CPackGen) if(NOT CPackGen)
message(FATAL_ERROR "CPackGen not set") message(FATAL_ERROR "CPackGen not set")
endif() endif()
get_filename_component(CPACK_LOCATION ${CMAKE_COMMAND} PATH)
set(CPackCommand "${CPACK_LOCATION}/cpack") message("CMAKE_CPACK_COMMAND = ${CMAKE_CPACK_COMMAND}")
message("cpack = ${CPackCommand}") if(NOT CMAKE_CPACK_COMMAND)
if(NOT CPackCommand) message(FATAL_ERROR "CMAKE_CPACK_COMMAND not set")
message(FATAL_ERROR "CPackCommand not set")
endif() endif()
if(NOT CPackComponentWay) if(NOT CPackComponentWay)
@ -92,7 +91,7 @@ endif()
message("config_args = ${config_args}") message("config_args = ${config_args}")
message("config_verbose = ${config_verbose}") message("config_verbose = ${config_verbose}")
execute_process(COMMAND ${CPackCommand} ${config_verbose} -G ${CPackGen} ${config_args} execute_process(COMMAND ${CMAKE_CPACK_COMMAND} ${config_verbose} -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

8
Tests/CPackTestAllGenerators/RunCPack.cmake
View File

@ -1,14 +1,10 @@
if(NOT DEFINED cpack)
message(FATAL_ERROR "cpack not defined")
endif()
if(NOT DEFINED dir) if(NOT DEFINED dir)
message(FATAL_ERROR "dir not defined") message(FATAL_ERROR "dir not defined")
endif() endif()
# Analyze 'cpack --help' output for list of available generators: # Analyze 'cpack --help' output for list of available generators:
# #
execute_process(COMMAND ${cpack} --help execute_process(COMMAND ${CMAKE_CPACK_COMMAND} --help
RESULT_VARIABLE result RESULT_VARIABLE result
OUTPUT_VARIABLE stdout OUTPUT_VARIABLE stdout
ERROR_VARIABLE stderr ERROR_VARIABLE stderr
@ -43,7 +39,7 @@ message(STATUS "CPack generators='${generators}'")
foreach(g ${generators}) foreach(g ${generators})
message(STATUS "Calling cpack -G ${g}...") message(STATUS "Calling cpack -G ${g}...")
execute_process(COMMAND ${cpack} -G ${g} execute_process(COMMAND ${CMAKE_CPACK_COMMAND} -G ${g}
RESULT_VARIABLE result RESULT_VARIABLE result
OUTPUT_VARIABLE stdout OUTPUT_VARIABLE stdout
ERROR_VARIABLE stderr ERROR_VARIABLE stderr