Commit 8518ae4e authored by Ben Boeckel's avatar Ben Boeckel
Browse files

ParaViewTestInstall: pass generator information down

parent ef5e72fd
......@@ -68,6 +68,20 @@ if (NOT irv EQUAL 0)
message(FATAL_ERROR "Could not build target 'install' for ParaView")
endif ()
set(generator_args)
if (CMAKE_GENERATOR)
list(APPEND generator_args
-G "${CMAKE_GENERATOR}")
endif ()
if (CMAKE_GENERATOR_PLATFORM)
list(APPEND generator_args
-A "${CMAKE_GENERATOR_PLATFORM}")
endif ()
if (CMAKE_GENERATOR_TOOLSET)
list(APPEND generator_args
-T "${CMAKE_GENERATOR_TOOLSET}")
endif ()
set (INSTALL_TEST_BUILD_DIR ${PARAVIEW_TEST_DIR}/Examples-bld)
if (NOT EXISTS ${INSTALL_TEST_BUILD_DIR})
execute_process(COMMAND ${CMAKE_COMMAND} -E
......@@ -75,6 +89,7 @@ if (NOT EXISTS ${INSTALL_TEST_BUILD_DIR})
endif ()
execute_process (
COMMAND ${CMAKE_COMMAND}
${generator_args}
-DParaView_DIR:PATH=${ParaView_DIR}
${PARAVIEW_SOURCE_DIR}/Examples
WORKING_DIRECTORY ${INSTALL_TEST_BUILD_DIR}
......
......@@ -1044,6 +1044,9 @@ if (BUILD_TESTING AND PARAVIEW_INSTALL_DEVELOPMENT_FILES)
-DPARAVIEW_SOURCE_DIR:PATH=${CMAKE_SOURCE_DIR}
-DPARAVIEW_TEST_DIR:PATH=${CMAKE_BINARY_DIR}/Testing/Temporary
-DPARAVIEW_CMAKE_DESTINATION:STRING=${paraview_cmake_destination}
-DCMAKE_GENERATOR:STRING=${CMAKE_GENERATOR}
-DCMAKE_GENERATOR_PLATFORM:STRING=${CMAKE_GENERATOR_PLATFORM}
-DCMAKE_GENERATOR_TOOLSET:STRING=${CMAKE_GENERATOR_TOOLSET}
-P ${CMAKE_CURRENT_SOURCE_DIR}/CMake/ParaViewTestInstall.cmake)
set_tests_properties(pv.TestDevelopmentInstall PROPERTIES
LABELS "paraview"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment