Update (C|CXX|LD)FLAGS for Meson and Autotools

Author: ViliusSutkus89

3rdparty/CompilerFlags.cmake

@@ -1,35 +1,33 @@
 # Get Compiler flags from our current CMake environment,
 # Will be passed to Autotools and Meson
 
-# -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -fno-addrsig -Wa,--noexecstack -Wformat -Werror=format-security 
 SET(CFLAGS ${CMAKE_C_FLAGS})
-# -g -DANDROID -fdata-sections -ffunction-sections -funwind-tables -fstack-protector-strong -no-canonical-prefixes -fno-addrsig -Wa,--noexecstack -Wformat -Werror=format-security -stdlib=libc++ 
 SET(CXXFLAGS ${CMAKE_CXX_FLAGS})
-# -Wl,--exclude-libs,libgcc.a -Wl,--exclude-libs,libatomic.a -static-libstdc++ -Wl,--build-id -Wl,--warn-shared-textrel -Wl,--fatal-warnings -Wl,--no-undefined -Qunused-arguments -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now
 SET(LDFLAGS ${ANDROID_LINKER_FLAGS})
 
 if (CMAKE_BUILD_TYPE STREQUAL Debug)
-  # -O0 -fno-limit-debug-info
   STRING(APPEND CFLAGS ${CMAKE_C_FLAGS_DEBUG})
-  # -O0 -fno-limit-debug-info 
   STRING(APPEND CXXFLAGS ${CMAKE_CXX_FLAGS_DEBUG})
 elseif(CMAKE_BUILD_TYPE STREQUAL Release)
-  # -O2 -DNDEBUG
   STRING(APPEND CFLAGS ${CMAKE_C_FLAGS_RELEASE})
-  # -O2 -DNDEBUG 
   STRING(APPEND CXXFLAGS ${CMAKE_CXX_FLAGS_RELEASE})
 elseif(CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
-  # -O2 -g -DNDEBUG
+  STRING(APPEND CFLAGS ${CMAKE_C_FLAGS_RELWITHDEBINFO})
   STRING(APPEND CXXFLAGS ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
 elseif(CMAKE_BUILD_TYPE STREQUAL MinSizeRel)
-  # -Os -DNDEBUG
+  STRING(APPEND CFLAGS ${CMAKE_C_FLAGS_MINSIZEREL})
   STRING(APPEND CXXFLAGS ${CMAKE_CXX_FLAGS_MINSIZEREL})
 endif()
 
 STRING(APPEND CFLAGS " -I${THIRDPARTY_PREFIX}/include")
 STRING(APPEND CXXFLAGS " -I${THIRDPARTY_PREFIX}/include")
 STRING(APPEND LDFLAGS " -L${THIRDPARTY_PREFIX}/lib")
 
+if(CMAKE_BUILD_TYPE STREQUAL MinSizeRel)
+  STRING(REPLACE "-g " " " CFLAGS ${CFLAGS})
+  STRING(REPLACE "-g " " " CXXFLAGS ${CXXFLAGS})
+endif()
+
 if (ANDROID)
   if(ANDROID_ABI STREQUAL armeabi-v7a)
     SET(AS ${ANDROID_TOOLCHAIN_ROOT}/bin/armv7a-linux-androideabi-as)

3rdparty/EPMeson.cmake

@@ -63,6 +63,14 @@ function(ExternalProjectMeson EXTERNAL_PROJECT_NAME)
       message(FATAL_ERROR "Unknown build type:" ${CMAKE_BUILD_TYPE})
     endif()
 
+    # Filter out unsupported arguments from FLAGS
+    STRING(REPLACE "-no-canonical-prefixes" " " MESON_CFLAGS ${CFLAGS})
+    STRING(REPLACE "-no-canonical-prefixes" " " MESON_CXXFLAGS ${CXXFLAGS})
+
+    # https://github.com/android-ndk/ndk/issues/884
+    STRING(REPLACE "-fno-addrsig" " " MESON_CFLAGS ${MESON_CFLAGS})
+    STRING(REPLACE "-fno-addrsig" " " MESON_CXXFLAGS ${MESON_CXXFLAGS})
+
     SET(MESON_ENV
       # https://github.com/mesonbuild/meson/issues/217
       # find_library is now cc.find_library and now uses the linker to check if a particular library is available (similar to how AC_CHECK_LIB does it). This means you can set the LIBRARY_PATH env variable (when using gcc/clang and the LIBPATH env variable when using MSVC) to point to your "library providing" root. It also accepts a colon-separated list of directories. This is how almost everyone does non-default-linker-search-path library searching and linking.
@@ -73,6 +81,10 @@ function(ExternalProjectMeson EXTERNAL_PROJECT_NAME)
       # Note that if you have a single prefix with all your dependencies, you might find it easier to append to the environment variables C_INCLUDE_PATH with GCC/Clang and INCLUDE with MSVC to expand the default include path, and LIBRARY_PATH with GCC/Clang and LIB with MSVC to expand the default library search path.
       C_INCLUDE_PATH=${THIRDPARTY_PREFIX}/include
       INCLUDE=${THIRDPARTY_PREFIX}/include
+
+      CFLAGS=${MESON_CFLAGS}
+      CXXFLAGS=${MESON_CXXFLAGS}
+      LDFLAGS=${LDFLAGS}
     )
 
     set(EPM_CONFIGURE_COMMAND ${CMAKE_COMMAND} -E env ${MESON_ENV}