Skip to content

Commit

Permalink
cmake: require 3.13, use target_link_directories()
Browse files Browse the repository at this point in the history
  • Loading branch information
asherikov committed Jan 3, 2025
1 parent e2cf076 commit e229ed1
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/head_2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ jobs:
make build-tests TYPE=Debug OPTIONS=ros TARGETS="all" TC=gcc ARGS=-V
jammy_static_checks:
jammy_spelling:
runs-on: ubuntu-22.04

steps:
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ UNRELEASED

Changed
-------
* API BROKEN: cmake changes not backward compatible!
* Rename exported cmake targets: use namespace and consistent naming.
* Require cmake >= 3.13.

Removed
-------
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# General parameters
cmake_minimum_required (VERSION 3.5.0)
cmake_minimum_required (VERSION 3.13.0)
project(ariles2 VERSION 2.4.0)


Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ Dependencies and compilation
Dependencies
------------

- `cmake` >= 3.1
- `cmake` >= 3.13
- `C++17` compatible compiler
- `boost`

Expand Down
1 change: 0 additions & 1 deletion cmake/arilesConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ set (@PROJECT_NAME@_VERSION @PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PRO
@PACKAGE_INIT@

@ARILES_FIND_CORE@
@ARILES_LINK_DIRECTORIES@

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

3 changes: 1 addition & 2 deletions cmake/ariles_install_component.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ add_dependencies(${VISITOR_TARGET_PREFIX}_${ARILES_VISITOR} ${TGT_ARILES_VISITOR

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

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

set(TGT_ARILES_VISITOR_LIB "")
set(ARILES_FIND_CORE "")
set(ARILES_LINK_DIRECTORIES "")

0 comments on commit e229ed1

Please sign in to comment.