From b69b69ab624a5bd0014d03b44f513541c60ec0d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkovsky@mmg.fjfi.cvut.cz>
Date: Sun, 1 Mar 2020 07:50:07 +0100
Subject: [PATCH] Removed --with-cxx-flags from the build script
If necessary, custom flags can be specified by simply exporting the
CXXFLAGS environment variable in the shell.
---
CMakeLists.txt | 2 +-
build | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a312b00cb9..ea0d8a30b6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,7 +82,7 @@ set( CMAKE_CXX_STANDARD_REQUIRED ON )
set( CMAKE_CXX_EXTENSIONS OFF )
# set default build options
-set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WITH_CXX_FLAGS} -pthread -Wall -Wno-unused-local-typedefs -Wno-unused-variable -Wno-unknown-pragmas" )
+set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -Wall -Wno-unused-local-typedefs -Wno-unused-variable -Wno-unknown-pragmas" )
set( CMAKE_CXX_FLAGS_DEBUG "-g" )
set( CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" )
# pass -rdynamic only in Debug mode
diff --git a/build b/build
index 5a26cbb619..ee74fa87bf 100755
--- a/build
+++ b/build
@@ -63,7 +63,6 @@ do
--with-tools=* ) WITH_TOOLS="${option#*=}" ;;
--with-benchmarks=* ) WITH_BENCHMARKS="${option#*=}" ;;
--with-python=* ) WITH_PYTHON="${option#*=}" ;;
- --with-cxx-flags=* ) WITH_CXX_FLAGS="${option#*=}" ;;
--with-ci-flags=* ) WITH_CI_FLAGS="${option#*=}" ;;
* )
echo "Unknown option ${option}. Use --help for more information."
@@ -94,8 +93,6 @@ if [[ ${HELP} == "yes" ]]; then
echo " --with-tools=yes/no Compile the 'src/Tools' directory. 'yes' by default."
echo " --with-python=yes/no Compile the Python bindings. 'yes' by default."
echo " --with-benchmarks=yes/no Compile the 'src/Benchmarks' directory. 'yes' by default."
- echo " --with-cxx-flags=FLAGS Additional flags for C++ compiler."
- echo " --with-cxx-flags=yes/no Turns on more strict C++ flags for CI. 'no' by default."
echo " --cmake=CMAKE Path to cmake. 'cmake' by default."
echo " --verbose It enables verbose build."
echo " --root-dir=PATH Path to the TNL source code root dir."
@@ -147,7 +144,6 @@ cmake_command=(
-DWITH_TOOLS=${WITH_TOOLS}
-DWITH_PYTHON=${WITH_PYTHON}
-DWITH_BENCHMARKS=${WITH_BENCHMARKS}
- -DWITH_CXX_FLAGS=${WITH_CXX_FLAGS}
-DWITH_CI_FLAGS=${WITH_CI_FLAGS}
-DDCMTK_DIR=${DCMTK_DIR}
)
--
GitLab