Skip to content

Commit 26bb483

Browse files
committed
make compatible with 3.16, because labplot uses 3.16
1 parent a7b9a75 commit 26bb483

File tree

3 files changed

+33
-20
lines changed

3 files changed

+33
-20
lines changed

CMakeLists.txt

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
cmake_minimum_required(VERSION 3.23)
2-
# FILE_SET needs cmake 3.23
1+
cmake_minimum_required(VERSION 3.16)
32

43
project(dbc VERSION 0.1.1 DESCRIPTION "C++ DBC Parser")
54

@@ -74,10 +73,13 @@ add_subdirectory(doc)
7473

7574
add_library(${PROJECT_NAME} STATIC ${SOURCE})
7675
target_link_libraries(${PROJECT_NAME} bitstream FastFloat::fast_float)
77-
target_sources(${PROJECT_NAME} INTERFACE FILE_SET HEADERS
78-
TYPE HEADERS
79-
BASE_DIRS ${PROJECT_SOURCE_DIR}/include/libdbc
80-
FILES ${HEADER_FILES})
76+
77+
if (${CMAKE_MINOR_VERSION} GREATER_EQUAL 23)
78+
target_sources(${PROJECT_NAME} INTERFACE FILE_SET HEADERS
79+
TYPE HEADERS
80+
BASE_DIRS ${PROJECT_SOURCE_DIR}/include/libdbc
81+
FILES ${HEADER_FILES})
82+
endif()
8183

8284
add_custom_target(release
8385
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
@@ -90,11 +92,15 @@ install(TARGETS ${PROJECT_NAME}
9092
DESTINATION ${CMAKE_INSTALL_LIBDIR})
9193

9294
# install headers
93-
install(TARGETS ${PROJECT_NAME}
94-
FILE_SET HEADERS
95-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lib${PROJECT_NAME}
96-
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
97-
)
95+
if (${CMAKE_MINOR_VERSION} GREATER_EQUAL 23)
96+
install(TARGETS ${PROJECT_NAME}
97+
FILE_SET HEADERS
98+
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/lib${PROJECT_NAME}
99+
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
100+
)
101+
else()
102+
install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/libdbc DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
103+
endif()
98104

99105
# Generate pkg-config file
100106
configure_file(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)

test/CMakeLists.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ list(APPEND TEST_SOURCES
1717
add_executable(tests ${TEST_SOURCES})
1818
target_compile_definitions(tests PRIVATE TESTDBCFILES_PATH="${CMAKE_CURRENT_SOURCE_DIR}/dbcs")
1919
target_link_libraries(tests PRIVATE dbc Catch2::Catch2WithMain)
20-
target_sources(tests INTERFACE FILE_SET HEADERS
21-
TYPE HEADERS
22-
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
23-
FILES defines.hpp)
20+
if (${CMAKE_MINOR_VERSION} GREATER_EQUAL 23)
21+
target_sources(tests INTERFACE FILE_SET HEADERS
22+
TYPE HEADERS
23+
BASE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}
24+
FILES defines.hpp)
25+
endif()
2426
catch_discover_tests(tests)
Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1-
cmake_minimum_required(VERSION 3.23)
1+
cmake_minimum_required(VERSION 3.16)
22
# FILE_SET needs cmake 3.23
33

44
project(bitstream)
55

66
add_library(${PROJECT_NAME} STATIC bitstream.c)
7-
target_sources(${PROJECT_NAME} INTERFACE FILE_SET HEADERS
8-
TYPE HEADERS
9-
BASE_DIRS ${PROJECT_SOURCE_DIR}
10-
FILES bitstream.h)
7+
8+
if (${CMAKE_MINOR_VERSION} GREATER_EQUAL 23)
9+
target_sources(${PROJECT_NAME} INTERFACE FILE_SET HEADERS
10+
TYPE HEADERS
11+
BASE_DIRS ${PROJECT_SOURCE_DIR}
12+
FILES bitstream.h)
13+
else()
14+
target_include_directories(${PROJECT_NAME} INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
15+
endif()

0 commit comments

Comments
 (0)