From cdf6dc35f4b0003d26ed8238ba7893c3a868af8f Mon Sep 17 00:00:00 2001 From: Andy Green <andy@warmcat.com> Date: Mon, 4 Mar 2019 20:43:58 +0800 Subject: [PATCH] cmake cross: non-bash doesn't deal with quoted options correctly Although it works find on Fedora / bash, the extra quotes are snipped on Ubuntu / dash. Removing the quotes works OK on both. --- contrib/cross-aarch64.cmake | 4 ++-- contrib/cross-arm-android-gnueabi.cmake | 4 ++-- contrib/cross-arm-linux-gnueabihf.cmake | 4 ++-- contrib/cross-esp32.cmake | 4 ++-- contrib/cross-ming.cmake | 4 ++-- contrib/cross-w32.cmake | 4 ++-- contrib/cross-w64.cmake | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/contrib/cross-aarch64.cmake b/contrib/cross-aarch64.cmake index 8f36fc38..c8d880d6 100644 --- a/contrib/cross-aarch64.cmake +++ b/contrib/cross-aarch64.cmake @@ -26,8 +26,8 @@ set(CMAKE_CXX_COMPILER "aarch64-linux-gnu-g++") # optimizations with -O3. # if (CMAKE_BUILD_TYPE MATCHES RELEASE OR CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES release) - set(CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}" -O2") - set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}" -O2") + set(CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE} -O2) + set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE} -O2) endif() #-nostdlib diff --git a/contrib/cross-arm-android-gnueabi.cmake b/contrib/cross-arm-android-gnueabi.cmake index f0a18a54..da9aaae6 100644 --- a/contrib/cross-arm-android-gnueabi.cmake +++ b/contrib/cross-arm-android-gnueabi.cmake @@ -30,8 +30,8 @@ set(CMAKE_CXX_COMPILER "${CROSS_PATH}/bin/arm-linux-androideabi-g++") # optimizations with -O3. # if (CMAKE_BUILD_TYPE MATCHES RELEASE OR CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES release) - set(CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}" -O2") - set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}" -O2") + set(CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE} -O2) + set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE} -O2) endif() # Where to look for the target environment. (More paths can be added here) diff --git a/contrib/cross-arm-linux-gnueabihf.cmake b/contrib/cross-arm-linux-gnueabihf.cmake index c7ceae9d..289f27a5 100644 --- a/contrib/cross-arm-linux-gnueabihf.cmake +++ b/contrib/cross-arm-linux-gnueabihf.cmake @@ -27,8 +27,8 @@ set(CMAKE_CXX_COMPILER "${CROSS_PATH}/bin/arm-linux-gnueabihf-g++") # optimizations with -O3. # if (CMAKE_BUILD_TYPE MATCHES RELEASE OR CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES release) - set(CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}" -O2") - set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}" -O2") + set(CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE} -O2) + set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE} -O2) endif() # Where to look for the target environment. (More paths can be added here) diff --git a/contrib/cross-esp32.cmake b/contrib/cross-esp32.cmake index b99c37d6..2c8996b7 100644 --- a/contrib/cross-esp32.cmake +++ b/contrib/cross-esp32.cmake @@ -27,8 +27,8 @@ set(CMAKE_LINKER "${CROSS_PATH}/bin/xtensa-esp32-elf-ld${EXECUTABLE_EXT}") # optimizations with -O3. # if (CMAKE_BUILD_TYPE MATCHES RELEASE OR CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES release) - set(CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}" -O2") - set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}" -O2") + set(CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE} -O2) + set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE} -O2) endif() SET(CMAKE_C_FLAGS "-nostdlib -Wall -Werror \ diff --git a/contrib/cross-ming.cmake b/contrib/cross-ming.cmake index 5d737dcf..1b210145 100644 --- a/contrib/cross-ming.cmake +++ b/contrib/cross-ming.cmake @@ -30,8 +30,8 @@ set(CMAKE_C_FLAGS "-Wno-error") # optimizations with -O3. # if (CMAKE_BUILD_TYPE MATCHES RELEASE OR CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES release) - set(CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}" -O2") - set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}" -O2") + set(CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE} -O2) + set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE} -O2) endif() # Where to look for the target environment. (More paths can be added here) diff --git a/contrib/cross-w32.cmake b/contrib/cross-w32.cmake index 0cb96cb3..05128857 100644 --- a/contrib/cross-w32.cmake +++ b/contrib/cross-w32.cmake @@ -29,8 +29,8 @@ set(CMAKE_C_FLAGS "-Wno-error") # optimizations with -O3. # if (CMAKE_BUILD_TYPE MATCHES RELEASE OR CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES release) - set(CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}" -O2") - set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}" -O2") + set(CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE} -O2) + set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE} -O2) endif() # Where to look for the target environment. (More paths can be added here) diff --git a/contrib/cross-w64.cmake b/contrib/cross-w64.cmake index 9d4a45ab..4fff8825 100644 --- a/contrib/cross-w64.cmake +++ b/contrib/cross-w64.cmake @@ -29,8 +29,8 @@ set(CMAKE_C_FLAGS "-Wno-error") # optimizations with -O3. # if (CMAKE_BUILD_TYPE MATCHES RELEASE OR CMAKE_BUILD_TYPE MATCHES Release OR CMAKE_BUILD_TYPE MATCHES release) - set(CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE}" -O2") - set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE}" -O2") + set(CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE} -O2) + set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE} -O2) endif() # Where to look for the target environment. (More paths can be added here) -- GitLab