CMake: sync with new jrl-cmakemodules

Author: nim65s

CMakeLists.txt

@@ -2,7 +2,7 @@
 # Copyright (c) 2021-2023 INRIA
 #
 
-CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.22)
 
 SET(PROJECT_NAME pycppad)
 SET(PROJECT_DESCRIPTION "Python bindings for CppAD and CppADCodeGen using Boost.Python")
@@ -21,11 +21,40 @@ SET(CMAKE_VERBOSE_MAKEFILE TRUE)
 SET(CXX_DISABLE_WERROR TRUE)
 
 # Check if the submodule cmake have been initialized
+<<<<<<< HEAD
 SET(JRL_CMAKE_MODULES "${CMAKE_CURRENT_LIST_DIR}/cmake")
 IF(NOT EXISTS "${JRL_CMAKE_MODULES}/base.cmake")
   MESSAGE(FATAL_ERROR "\nPlease run the following command first:\ngit submodule update --init\n")
 ENDIF()
+||||||| parent of 424d719 (CMake: sync with new jrl-cmakemodules)
+IF(NOT EXISTS "${CMAKE_SOURCE_DIR}/cmake/base.cmake")
+  MESSAGE(FATAL_ERROR "\nPlease run the following command first:\ngit submodule update --init\n")
+ENDIF()
+=======
+set(JRL_CMAKE_MODULES "${CMAKE_CURRENT_LIST_DIR}/cmake")
+if(EXISTS "${JRL_CMAKE_MODULES}/base.cmake")
+  message(STATUS "JRL cmakemodules found in 'cmake/' git submodule")
+else()
+  find_package(jrl-cmakemodules QUIET CONFIG)
+  if(jrl-cmakemodules_FOUND)
+    get_property(
+      JRL_CMAKE_MODULES
+      TARGET jrl-cmakemodules::jrl-cmakemodules
+      PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+    message(STATUS "JRL cmakemodules found on system at ${JRL_CMAKE_MODULES}")
+  else()
+    message(STATUS "JRL cmakemodules not found. Let's fetch it.")
+    include(FetchContent)
+    FetchContent_Declare(
+      "jrl-cmakemodules"
+      GIT_REPOSITORY "https://github.com/jrl-umi3218/jrl-cmakemodules.git")
+    FetchContent_MakeAvailable("jrl-cmakemodules")
+    FetchContent_GetProperties("jrl-cmakemodules" SOURCE_DIR JRL_CMAKE_MODULES)
+  endif()
+endif()
+>>>>>>> 424d719 (CMake: sync with new jrl-cmakemodules)
 
+<<<<<<< HEAD
 if(EXISTS "${JRL_CMAKE_MODULES}/base.cmake")
   message(STATUS "JRL cmakemodules found in 'cmake/' git submodule")
 else()
@@ -52,7 +81,14 @@ else()
     FetchContent_GetProperties("jrl-cmakemodules" SOURCE_DIR JRL_CMAKE_MODULES)
   endif()
 endif()
-
+||||||| parent of 424d719 (CMake: sync with new jrl-cmakemodules)
+INCLUDE(cmake/base.cmake)
+INCLUDE(cmake/boost.cmake)
+INCLUDE(cmake/ide.cmake)
+=======
+>>>>>>> 424d719 (CMake: sync with new jrl-cmakemodules)
+
+<<<<<<< HEAD
 # Use BoostConfig module distributed by boost library instead of using FindBoost module distributed
 # by CMake
 if(POLICY CMP0167)
@@ -64,6 +100,13 @@ INCLUDE(${JRL_CMAKE_MODULES}/ide.cmake)
 INCLUDE(${JRL_CMAKE_MODULES}/python.cmake)
 
 SET(CMAKE_MODULE_PATH "${JRL_CMAKE_MODULES}/find-external/CppAD/" ${CMAKE_MODULE_PATH})
+||||||| parent of 424d719 (CMake: sync with new jrl-cmakemodules)
+SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/find-external/CppAD/" ${CMAKE_MODULE_PATH})
+=======
+include("${JRL_CMAKE_MODULES}/base.cmake")
+include("${JRL_CMAKE_MODULES}/boost.cmake")
+include("${JRL_CMAKE_MODULES}/ide.cmake")
+>>>>>>> 424d719 (CMake: sync with new jrl-cmakemodules)
 
 # Project definition
 COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
@@ -83,7 +126,7 @@ IF(BUILD_WITH_CPPAD_CODEGEN_BINDINGS)
   ADD_DEFINITIONS(-DPYCPPAD_WITH_CPPAD_CODEGEN_BINDINGS)
 ENDIF(BUILD_WITH_CPPAD_CODEGEN_BINDINGS)
 
-ADD_PROJECT_DEPENDENCY(cppad 20180000.0 REQUIRED PKG_CONFIG_REQUIRES "cppad >= 20180000.0")
+ADD_PROJECT_DEPENDENCY(cppad 20180000.0 REQUIRED PKG_CONFIG_REQUIRES "cppad >= 20180000.0" FIND_EXTERNAL "CppAD")
 ADD_PROJECT_DEPENDENCY(Eigen3 REQUIRED PKG_CONFIG_REQUIRES "eigen3 >= 3.0.5")
 SET(PYTHON_COMPONENTS Interpreter Development NumPy)
 FINDPYTHON(REQUIRED)
@@ -178,7 +221,4 @@ PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
 PKG_CONFIG_APPEND_CFLAGS("-I${PYTHON_INCLUDE_DIRS}")
 PKG_CONFIG_APPEND_BOOST_LIBS(${BOOST_COMPONENTS})
 
-# Install catkin package.xml
-INSTALL(FILES package.xml DESTINATION share/${PROJECT_NAME})
-
 setup_project_finalize()

python/CMakeLists.txt

@@ -40,8 +40,15 @@ SET_TARGET_PROPERTIES(${PYWRAP}
   RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/python/${PROJECT_NAME}"
   )
 
-IF(UNIX AND NOT APPLE)
-  SET_TARGET_PROPERTIES(${PYWRAP} PROPERTIES INSTALL_RPATH "\$ORIGIN/../../..")
+IF(UNIX)
+  GET_RELATIVE_RPATH(
+    ${${PYWRAP}_INSTALL_DIR}
+    ${PYWRAP}_INSTALL_RPATH
+  )
+  set_target_properties(
+    ${PYWRAP}
+    PROPERTIES INSTALL_RPATH "${${PYWRAP}_INSTALL_RPATH}"
+  )
 ENDIF()
 
 INSTALL(TARGETS ${PYWRAP} DESTINATION ${${PYWRAP}_INSTALL_DIR})