From 24ba0d0e72b59772012c20c57c86a9d7e6703668 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Tue, 25 Jun 2019 03:04:35 -0600 Subject: [PATCH] CMake: Fix Interrogate macro not working on CMake 3.0.2 --- cmake/macros/Interrogate.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake/macros/Interrogate.cmake b/cmake/macros/Interrogate.cmake index a7fb131916..c50eabcecd 100644 --- a/cmake/macros/Interrogate.cmake +++ b/cmake/macros/Interrogate.cmake @@ -231,7 +231,9 @@ function(interrogate_sources target output database language_flags) add_custom_command( OUTPUT "${output}" "${database}" COMMAND ${CMAKE_COMMAND} -E - make_directory "${output_directory}" "${database_directory}" + make_directory "${output_directory}" + COMMAND ${CMAKE_COMMAND} -E + make_directory "${database_directory}" COMMAND host_interrogate -oc "${output}" -od "${database}" @@ -342,7 +344,8 @@ function(add_python_module module) COMMENT "Generating module ${module}") add_python_target(${module} COMPONENT "${component}" EXPORT "${component}" - "${CMAKE_CFG_INTDIR}/${module}_module.cxx" ${sources_abs} ${extensions}) + "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/${module}_module.cxx" + ${sources_abs} ${extensions}) target_link_libraries(${module} ${link_targets}) if(CMAKE_VERSION VERSION_LESS "3.11")