Commit ea2d93aa authored by Andrew Bauer's avatar Andrew Bauer Committed by Kitware Robot

Merge topic 'catalyst_generator'

5078b93d Pass superbuild generator to Catalyst CMake configuration
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel's avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !392
parents ba8a7fda 5078b93d
Pipeline #85044 failed with stage
in 0 seconds
...@@ -37,6 +37,7 @@ foreach (catalyst_edition IN LISTS catalyst_editions) ...@@ -37,6 +37,7 @@ foreach (catalyst_edition IN LISTS catalyst_editions)
endforeach () endforeach ()
set(catalyst_cmake_args set(catalyst_cmake_args
-G "${CMAKE_GENERATOR}"
-DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=TRUE -DPARAVIEW_INSTALL_DEVELOPMENT_FILES:BOOL=TRUE
-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
-DCMAKE_PREFIX_PATH:PATH=<INSTALL_DIR> -DCMAKE_PREFIX_PATH:PATH=<INSTALL_DIR>
...@@ -46,7 +47,7 @@ set(catalyst_cmake_args ...@@ -46,7 +47,7 @@ set(catalyst_cmake_args
-DCMAKE_SHARED_LINKER_FLAGS:STRING=${project_ld_flags}) -DCMAKE_SHARED_LINKER_FLAGS:STRING=${project_ld_flags})
superbuild_add_project(catalyst superbuild_add_project(catalyst
DEPENDS mpi python DEPENDS mpi python
CONFIGURE_COMMAND CONFIGURE_COMMAND
${pv_python_executable} <SOURCE_DIR>/Catalyst/catalyze.py ${pv_python_executable} <SOURCE_DIR>/Catalyst/catalyze.py
${catalyst_edition_args} ${catalyst_edition_args}
......
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