From 070a6b35e93ca15deed8b059dfa0d491488f0519 Mon Sep 17 00:00:00 2001 From: reuk Date: Wed, 18 Jan 2023 14:38:48 +0000 Subject: [PATCH] CMake: Avoid passing generator platform to jucaide build 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. --- extras/Build/juceaide/CMakeLists.txt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/extras/Build/juceaide/CMakeLists.txt b/extras/Build/juceaide/CMakeLists.txt index 422d8d093e..549bd1c8d6 100644 --- a/extras/Build/juceaide/CMakeLists.txt +++ b/extras/Build/juceaide/CMakeLists.txt @@ -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