Skip to content

Commit 0f8eb32

Browse files
committed
Revert CMake version bump, but instead add header files into INTERFACE projects if version >= 3.19
1 parent 1dee717 commit 0f8eb32

File tree

9 files changed

+26
-12
lines changed

9 files changed

+26
-12
lines changed

Diff for: CMakeLists.txt

+13-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
22

33
project(dragonbox
44
VERSION 1.1.3
@@ -21,7 +21,11 @@ endif()
2121

2222
set(dragonbox_headers include/dragonbox/dragonbox.h)
2323

24-
add_library(dragonbox INTERFACE ${dragonbox_headers})
24+
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.19.0")
25+
add_library(dragonbox INTERFACE ${dragonbox_headers})
26+
else()
27+
add_library(dragonbox INTERFACE)
28+
endif()
2529
add_library(dragonbox::dragonbox ALIAS dragonbox)
2630

2731
target_include_directories(dragonbox
@@ -33,7 +37,13 @@ target_compile_features(dragonbox INTERFACE cxx_std_17)
3337

3438
# ---- Declare library (dragonbox_to_chars) ----
3539

36-
set(dragonbox_to_chars_headers include/dragonbox/dragonbox_to_chars.h)
40+
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.19.0")
41+
set(dragonbox_to_chars_headers include/dragonbox/dragonbox_to_chars.h)
42+
else()
43+
set(dragonbox_to_chars_headers
44+
${dragonbox_headers}
45+
include/dragonbox/dragonbox_to_chars.h)
46+
endif()
3747

3848
set(dragonbox_to_chars_sources source/dragonbox_to_chars.cpp)
3949

Diff for: subproject/3rdparty/grisu_exact/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
22

33
project(grisu_exact LANGUAGES CXX)
44

Diff for: subproject/3rdparty/ryu/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
22

33
project(ryu_cmake LANGUAGES C)
44

Diff for: subproject/3rdparty/schubfach/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
22

33
project(schubfach LANGUAGES CXX)
44

Diff for: subproject/benchmark/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
22

33
project(benchmark LANGUAGES CXX)
44

Diff for: subproject/common/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
22

33
project(dragonbox_common LANGUAGES CXX)
44

Diff for: subproject/meta/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
22

33
project(dragonbox_meta LANGUAGES CXX)
44

Diff for: subproject/simple/CMakeLists.txt

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
1-
cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
22

33
project(dragonbox_simple LANGUAGES CXX)
44

55
set(dragonbox_simple_headers include/simple_dragonbox.h)
66

7-
add_library(dragonbox_simple INTERFACE ${dragonbox_simple_headers})
7+
if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.19.0")
8+
add_library(dragonbox_simple INTERFACE ${dragonbox_simple_headers})
9+
else()
10+
add_library(dragonbox_simple INTERFACE)
11+
endif()
812
add_library(dragonbox::simple ALIAS dragonbox_simple)
913

1014
target_include_directories(dragonbox_simple

Diff for: subproject/test/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.19 FATAL_ERROR)
1+
cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
22

33
project(dragonboxTests LANGUAGES CXX)
44

0 commit comments

Comments
 (0)