Commit a35a4479 authored by Matthew Woehlke's avatar Matthew Woehlke
Browse files

fix superbuild with ninja

Fix the horribly broken PVExternalProject.cmake to actually work with
Ninja. (Note: it works by chance on Windows because it just punts to
plain ExternalProject for that case, but has issues elsewhere.)
parent 5feec128
...@@ -44,6 +44,8 @@ function (PVExternalProject_Add name) ...@@ -44,6 +44,8 @@ function (PVExternalProject_Add name)
# just create a temporary target so we can set target properties. # just create a temporary target so we can set target properties.
add_custom_target(pv-${name}) add_custom_target(pv-${name})
set(binary_dir ${CMAKE_CURRENT_BINARY_DIR}/${name}/src/${name}-build)
_ep_parse_arguments(PVExternalProject_Add pv-${name} _EP_ "${ARGN}") _ep_parse_arguments(PVExternalProject_Add pv-${name} _EP_ "${ARGN}")
get_property(has_process_environment TARGET pv-${name} get_property(has_process_environment TARGET pv-${name}
...@@ -99,8 +101,8 @@ function (PVExternalProject_Add name) ...@@ -99,8 +101,8 @@ function (PVExternalProject_Add name)
# GNU make recognizes the string "$(MAKE)" as recursive make, so # GNU make recognizes the string "$(MAKE)" as recursive make, so
# ensure that it appears directly in the makefile. # ensure that it appears directly in the makefile.
string(REGEX REPLACE "^\\$\\(MAKE\\)" "${CMAKE_MAKE_PROGRAM} -j5" build_cmd "${build_cmd}") string(REGEX REPLACE "^\\$\\(MAKE\\)" "${CMAKE_MAKE_PROGRAM} -j5" build_cmd "${build_cmd}")
set_property(TARGET pv-${name} PROPERTY _EP_BUILD_COMMAND "${build_cmd}")
endif() endif()
set_property(TARGET pv-${name} PROPERTY _EP_BUILD_COMMAND "${build_cmd}")
set(has_build_command 1) set(has_build_command 1)
endif() endif()
......
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