Update head_2

asherikov · Jan 3, 2025 · a55abc2 · a55abc2
1 parent a51f4a0
commit a55abc2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 11 deletions.
diff --git a/ariles/CHANGELOG.md b/ariles/CHANGELOG.md
@@ -6,7 +6,13 @@ UNRELEASED
 
 Changed
 -------
+* API BROKEN: cmake changes not backward compatible!
 * Rename exported cmake targets: use namespace and consistent naming.
+* Require cmake >= 3.13.
+
+Removed
+-------
+* Deprecated `${PROJECT_NAME}-${ARILES_COMPONENT}_LIBRARIES` cmake variables.
 
 
 2.4.0

diff --git a/ariles/CMakeLists.txt b/ariles/CMakeLists.txt
@@ -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)
 
 
@@ -326,9 +326,6 @@ if (${ARILES_ENABLE_CORE})
         ARCHIVE_FILE "${CPACK_PACKAGE_NAME}-core-${CPACK_PACKAGE_VERSION}")
 
 
-    set(ariles_LIBRARIES "${PROJECT_NAME}-core_LIBRARIES")
-    set(ARILES_LIBRARIES "${PROJECT_NAME}::core")
-
     set(ARILES_COMPONENT_CMAKE_DIR "share/${PROJECT_NAME}-core/")
 
 

diff --git a/ariles/README.md b/ariles/README.md
@@ -232,7 +232,7 @@ Dependencies and compilation
 Dependencies
 ------------
 
-- `cmake` >= 3.1
+- `cmake` >= 3.13
 - `C++17` compatible compiler
 - `boost`
 

diff --git a/ariles/cmake/arilesConfig.cmake.in b/ariles/cmake/arilesConfig.cmake.in
@@ -3,8 +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")
 
-set (@ariles_LIBRARIES@ "@ARILES_LIBRARIES@")
diff --git a/ariles/cmake/ariles_install_component.cmake b/ariles/cmake/ariles_install_component.cmake
@@ -67,11 +67,9 @@ set(ARILES_VISITOR_${ARILES_VISITOR}_LIBS "${TGT_ARILES_VISITOR_LIB};${ARILES_VI
 add_dependencies(${VISITOR_TARGET_PREFIX}_${ARILES_VISITOR} ${TGT_ARILES_VISITOR_LIB})
 
 
-set(ariles_LIBRARIES "${PROJECT_NAME}-${ARILES_COMPONENT}_LIBRARIES")
-set(ARILES_LIBRARIES "${PROJECT_NAME}::${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"
@@ -116,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 "")