Skip to content

Commit 03b719a

Browse files
authored
Merge pull request #13 from chfast/cmake-drop-opt-flags
CMake: Drop support for OPT_FLAGS
2 parents 7b19ed9 + 4a6ad21 commit 03b719a

File tree

1 file changed

+6
-22
lines changed

1 file changed

+6
-22
lines changed

CMakeLists.txt

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ cmake_minimum_required(VERSION 2.8)
22

33
project (libff)
44

5+
# Default to RelWithDebInfo configuration if no configuration is explicitly specified.
6+
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
7+
set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "Build type on single-configuration generators" FORCE)
8+
endif()
9+
510
set(
611
CURVE
712
"BN128"
@@ -81,14 +86,6 @@ option(
8186
ON
8287
)
8388

84-
set(
85-
OPT_FLAGS
86-
""
87-
CACHE
88-
STRING
89-
"Override C++ compiler optimization flags"
90-
)
91-
9289
if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
9390
# Common compilation flags and warning configuration
9491
set(
@@ -98,20 +95,8 @@ if(CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
9895
if("${MULTICORE}")
9996
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
10097
endif()
101-
# Default optimizations flags (to override, use -DOPT_FLAGS=...)
102-
if("${OPT_FLAGS}" STREQUAL "")
103-
set(
104-
OPT_FLAGS
105-
"-ggdb3 -O2 -march=native -mtune=native"
106-
)
107-
endif()
10898
endif()
10999

110-
set(
111-
CMAKE_CXX_FLAGS
112-
"${CMAKE_CXX_FLAGS} ${OPT_FLAGS}"
113-
)
114-
115100
find_path(GMP_INCLUDE_DIR NAMES gmp.h)
116101
find_library(GMP_LIBRARY gmp)
117102
if(GMP_LIBRARY MATCHES ${CMAKE_SHARED_LIBRARY_SUFFIX})
@@ -127,9 +112,8 @@ set_target_properties(
127112
INTERFACE_INCLUDE_DIRECTORIES ${GMP_INCLUDE_DIR}
128113
)
129114

130-
include(FindPkgConfig)
131-
132115
if("${WITH_PROCPS}")
116+
include(FindPkgConfig)
133117
pkg_check_modules(
134118
PROCPS
135119
REQUIRED

0 commit comments

Comments
 (0)