From cc7f6f58af3188a8620b90fdad6e8ca5d026f543 Mon Sep 17 00:00:00 2001 From: David Runge Date: Thu, 21 May 2020 17:30:27 +0200 Subject: [PATCH] Respecting external CFLAGS, CXXFLAGS and LDFLAGS CMakeLists.txt: Adding BUILD_SSE (similar to artyfx) to add SSE flags. Adding CMAKE_CXX_FLAGS, CMAKE_SHARED_LINKER_FLAGS and CMAKE_C_FLAGS in such a way, that they allow externally set CFLAGS/CXXFLAGS/LDFLAGS (respectively). Removing RELEASE_BUILD specific overrides for CFLAGS/CXXFLAGS. --- CMakeLists.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7c0d989..ff03515 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ set(SORCER_VERSION_PATCH "3") set(SORCER_VERSION "${SORCER_VERSION_MAJOR}.${SORCER_VERSION_MINOR}.${SORCER_VERSION_PATCH}") option(RELEASE_BUILD "Build for production usage" ON ) +option(BUILD_SSE "Build with SSE flags" ON ) find_package(PkgConfig) @@ -26,11 +27,15 @@ pkg_check_modules(CAIRO cairo REQUIRED) include_directories( ${CAIRO_INCLUDE_DIRS} ) link_directories ( ${CAIRO_LIBRARY_DIRS} ) -SET(CMAKE_SHARED_LINKER_FLAGS "-fPIC -shared -Wl,-z,nodelete -Wl,--no-undefined") +SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fPIC -shared -Wl,-z,nodelete -Wl,--no-undefined") +SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -g -Wall -Wno-unused-variable -ffast-math") +SET(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -g -Wall -W -Wno-unused-variable -ffast-math") -IF(RELEASE_BUILD) - SET(CMAKE_CXX_FLAGS "-g -Wall -Wno-unused-variable -msse2 -mfpmath=sse -ffast-math") - SET(CMAKE_C_FLAGS "-g -Wall -W -Wno-unused-variable -msse2 -mfpmath=sse -ffast-math") +IF(BUILD_SSE) + IF(NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm") + SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse2 -mfpmath=sse -ffast-math") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse2 -mfpmath=sse -ffast-math") + ENDIF() ENDIF() ## The following commands will re-generate the .cpp files from the FAUST .dsp,