mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

CMake: Avoid passing generator platform to jucaide build

Browse source 
When building for arm64 with a VS generator on a x86_64 host,
CMAKE_CROSSCOMPILING is not set, and copying the generator platform can
result in a juceaide binary that doesn't run on the host system.

The removed code no longer seems to be necessary when configuring with
newer Clion versions.
This commit is contained in:
reuk 2023-01-18 14:38:48 +00:00
parent 33673eac17
commit 070a6b35e9
No known key found for this signature in database
GPG key ID: 9ADCD339CFC98A11
1 changed files with 0 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
extras/Build/juceaide/CMakeLists.txt
View file

@ -97,14 +97,6 @@ else()
if(DEFINED ENV{PATH_ORIG})
set(ENV{PATH} "$ENV{PATH_ORIG}")
endif()
else()
# When building with clang-cl in Clion on Windows for an x64 target, the ABI detection phase
# of the inner build can fail unless we pass through these flags too
set(extra_configure_flags
"-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}"
"-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}"
"-DCMAKE_EXE_LINKER_FLAGS=${CMAKE_EXE_LINKER_FLAGS}"
"-DCMAKE_GENERATOR_PLATFORM=${CMAKE_GENERATOR_PLATFORM}")
endif()
message(STATUS "Configuring juceaide")
@ -118,7 +110,6 @@ else()
"-DCMAKE_BUILD_TYPE=Debug"
"-DJUCE_BUILD_HELPER_TOOLS=ON"
"-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}"
${extra_configure_flags}
WORKING_DIRECTORY "${JUCE_SOURCE_DIR}"
OUTPUT_VARIABLE command_output
ERROR_VARIABLE command_output