Skip to content

Commit f73821d

Browse files
committed
Fixed CMake flto flags
1 parent fd8ed74 commit f73821d

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

CMakeLists.txt

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required (VERSION 3.8.0)
1+
cmake_minimum_required (VERSION 3.9)
22
project(openafis CXX)
33

44
set(CMAKE_CXX_STANDARD 17)
@@ -7,6 +7,13 @@ set(CMAKE_CXX_EXTENSIONS NO)
77

88
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules")
99
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
10+
11+
include(CheckIPOSupported)
12+
check_ipo_supported(RESULT result)
13+
if (result)
14+
set(CMAKE_INTERPROCEDURAL_OPTIMIZATION ON)
15+
endif()
16+
1017
include(CheckCXXCompilerFlag)
1118
include(AddCXXCompilerFlag)
1219

@@ -20,7 +27,6 @@ if (MSVC)
2027
add_cxx_compiler_flag(/Ot)
2128
add_cxx_compiler_flag(/Oy)
2229
add_cxx_compiler_flag(/GT)
23-
add_cxx_compiler_flag(/GL)
2430
add_cxx_compiler_flag(/Zc:__cplusplus)
2531

2632
if (NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
@@ -38,11 +44,6 @@ if (MSVC)
3844
add_definitions(-D_HAS_EXCEPTIONS=0)
3945
add_definitions(-D_ITERATOR_DEBUG_LEVEL=0)
4046
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
41-
42-
if (NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
43-
set(CMAKE_STATIC_LINKER_FLAGS_RELEASE "${CMAKE_STATIC_LINKER_FLAGS_RELEASE} /LTCG")
44-
set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /LTCG")
45-
endif()
4647
else()
4748
add_cxx_compiler_flag(-O3)
4849
add_cxx_compiler_flag(-march=native)
@@ -58,8 +59,7 @@ else()
5859
add_cxx_compiler_flag(-Wno-deprecated)
5960
add_cxx_compiler_flag(-fno-exceptions)
6061
add_cxx_compiler_flag(-Wthread-safety)
61-
add_cxx_compiler_flag(-flto)
62-
62+
6363
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
6464
find_program(GCC_AR gcc-ar)
6565
if (GCC_AR)

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
A high-performance one-to-many (1:N) fingerprint matching library for commodity hardware, written in modern platform-independent C++.
44

55
[![License: BSD-2-Clause](https://img.shields.io/github/license/neilharan/openafis.svg)](./LICENSE)
6-
[![C++ Standard](https://img.shields.io/badge/C%2B%2B-17%2F20-blue.svg)](https://img.shields.io/badge/C%2B%2B-17%2F20-blue.svg)
6+
![C++ Standard](https://img.shields.io/badge/C%2B%2B-17%2F20-blue.svg)
77

88
Note: this library is focused on the matching problem. It does not currently extract minutiae from images.
99

cli/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required (VERSION 3.8.0)
1+
cmake_minimum_required (VERSION 3.9)
22

33
set(VERSION "0.0.1")
44

lib/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required (VERSION 3.8.0)
1+
cmake_minimum_required (VERSION 3.9)
22

33
set(VERSION "0.0.1")
44

0 commit comments

Comments
 (0)