Skip to content

build(android): give the host include-bin helper a .exe suffix on Windows hosts #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
manon-traverse wants to merge 1 commit into
base: v1.x
Choose a base branch
from
Draft

build(android): give the host include-bin helper a .exe suffix on Windows hosts #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions renderdoc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,13 +493,21 @@ if(UNIX)
if(CMAKE_CROSSCOMPILING)
set(HOST_NATIVE_CPP_COMPILER c++ CACHE STRING "Command to run to compile a .cpp into an executable. Default is just c++")

add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin
# The host helper must carry a .exe suffix when the host is Windows, else
# cmd.exe can't execute it (the target being Android makes UNIX true).
if(CMAKE_HOST_WIN32)
set(HOST_EXE_SUFFIX ".exe")
else()
set(HOST_EXE_SUFFIX "")
endif()

add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin${HOST_EXE_SUFFIX}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
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
COMMAND ${HOST_NATIVE_CPP_COMPILER} 3rdparty/include-bin/main.cpp -o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin${HOST_EXE_SUFFIX}
DEPENDS 3rdparty/include-bin/main.cpp)
set(INCLUDE_BIN_EXE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
set(INCLUDE_BIN_DEP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin")
set(INCLUDE_BIN_EXE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin${HOST_EXE_SUFFIX}")
set(INCLUDE_BIN_DEP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin${HOST_EXE_SUFFIX}")
else()
add_executable(include-bin 3rdparty/include-bin/main.cpp)
set(INCLUDE_BIN_EXE $<TARGET_FILE:include-bin>)
Expand Down