Skip to content

Commit e229ed1

Browse files
committed
cmake: require 3.13, use target_link_directories()
1 parent e2cf076 commit e229ed1

6 files changed

+6
-6
lines changed

.github/workflows/head_2.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ jobs:
132132
make build-tests TYPE=Debug OPTIONS=ros TARGETS="all" TC=gcc ARGS=-V
133133
134134
135-
jammy_static_checks:
135+
jammy_spelling:
136136
runs-on: ubuntu-22.04
137137

138138
steps:

CHANGELOG.md

+2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ UNRELEASED
66

77
Changed
88
-------
9+
* API BROKEN: cmake changes not backward compatible!
910
* Rename exported cmake targets: use namespace and consistent naming.
11+
* Require cmake >= 3.13.
1012

1113
Removed
1214
-------

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# General parameters
2-
cmake_minimum_required (VERSION 3.5.0)
2+
cmake_minimum_required (VERSION 3.13.0)
33
project(ariles2 VERSION 2.4.0)
44

55

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ Dependencies and compilation
232232
Dependencies
233233
------------
234234

235-
- `cmake` >= 3.1
235+
- `cmake` >= 3.13
236236
- `C++17` compatible compiler
237237
- `boost`
238238

cmake/arilesConfig.cmake.in

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ set (@PROJECT_NAME@_VERSION @PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PRO
33
@PACKAGE_INIT@
44

55
@ARILES_FIND_CORE@
6-
@ARILES_LINK_DIRECTORIES@
76

87
include("${CMAKE_CURRENT_LIST_DIR}/@ARILES_COMPONENT@_targets.cmake")
98

cmake/ariles_install_component.cmake

+1-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ add_dependencies(${VISITOR_TARGET_PREFIX}_${ARILES_VISITOR} ${TGT_ARILES_VISITOR
6969

7070
set(ARILES_FIND_CORE "find_package(${PROJECT_NAME}-core REQUIRED)")
7171
if(ARILES_VISITOR_${ARILES_VISITOR}_LIBRARY_DIRS)
72-
set(ARILES_LINK_DIRECTORIES "link_directories(\"${ARILES_VISITOR_${ARILES_VISITOR}_LIBRARY_DIRS}\")")
72+
target_link_directories(${TGT_ARILES_VISITOR_LIB} PUBLIC "${ARILES_VISITOR_${ARILES_VISITOR}_LIBRARY_DIRS}")
7373
endif()
7474

7575
configure_package_config_file( "${PROJECT_SOURCE_DIR}/cmake/arilesConfig.cmake.in"
@@ -114,4 +114,3 @@ set("DEB_CMAKE_FLAGS_${ARILES_COMPONENT}" "-DARILES_VISITOR_${ARILES_VISITOR}=ON
114114

115115
set(TGT_ARILES_VISITOR_LIB "")
116116
set(ARILES_FIND_CORE "")
117-
set(ARILES_LINK_DIRECTORIES "")

0 commit comments

Comments
 (0)