From 73c315961585de9e8c9c82394c4d0bd5cc2d1fa7 Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 18 Feb 2019 11:12:20 +0000 Subject: [PATCH] Find include-bin via $ when not cross-compiling * On macOS it's not output directly into the runtime output directory, but under a subdir for each build type (e.g. Debug, Release). --- renderdoc/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt index 0d41b7377..bdf4c980a 100644 --- a/renderdoc/CMakeLists.txt +++ b/renderdoc/CMakeLists.txt @@ -358,8 +358,10 @@ if(UNIX) COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} COMMAND ${HOST_NATIVE_CPP_COMPILER} 3rdparty/include-bin/main.cpp -o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin DEPENDS 3rdparty/include-bin/main.cpp) + set(INCLUDE_BIN_EXE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin") else() add_executable(include-bin 3rdparty/include-bin/main.cpp) + set(INCLUDE_BIN_EXE $) endif() foreach(res ${data}) @@ -371,8 +373,8 @@ if(UNIX) add_custom_command(OUTPUT ${out_src} WORKING_DIRECTORY ${working_dir} COMMAND ${CMAKE_COMMAND} -E make_directory ${out_src_dir} - COMMAND ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin ${in} ${out_src} - DEPENDS ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin + COMMAND ${INCLUDE_BIN_EXE} ${in} ${out_src} + DEPENDS ${INCLUDE_BIN_EXE} DEPENDS ${res}) list(APPEND data_objects ${out_src})