Added cmake statements to setup RPATH upon 'make install'

Author: joern274

CHANGELOG.md

@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
 * added `dataflow::Result::create_modules` function that takes nothing but group IDs for easier module creation
 * changed and unified context menus for all widgets related to netlist elements
 * fixed module colors not updating on creation of modules with previously used ids
+* fixed `netlist_preprocessing` build dependencies
+* fixed cmake warnings that minimum version 3.5 is required
+* added RPATH setting so that libraries get found after `make install`
 * added python bindings `gui.View` for management of contexts and directories
 
 ## [4.4.1](v4.4.1) - 2024-07-29 14:21:42+02:00 (urgency: medium)

CMakeLists.txt

@@ -130,6 +130,25 @@ set(CMAKE_C_STANDARD_REQUIRED on)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED on)
 
+# Do not hardcode install RPATH into build tree binaries
+set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+set(CMAKE_SKIP_BUILD_RPATH FALSE)
+
+# Add the install RPATH (for use after make install)
+if (DEFINED LIBRARY_INSTALL_DIRECTORY_FULL)
+    set(CMAKE_INSTALL_RPATH "${LIBRARY_INSTALL_DIRECTORY_FULL}")
+elseif (DEFINED CMAKE_INSTALL_PREFIX)
+    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+else()
+    set(CMAKE_INSTALL_RPATH "/usr/local/lib")
+endif()
+
+# Also include the library path from linked targets in the install RPATH
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+# Optional: Make sure build tree still works by allowing RPATH in build
+set(CMAKE_SKIP_BUILD_RPATH FALSE)
+
 # Set Build Timestamp (used in configured file)
 string(TIMESTAMP BUILD_TIMESTAMP UTC)
 string(TIMESTAMP CURRENT_YEAR "%Y")

app/CMakeLists.txt

@@ -3,6 +3,7 @@ set(SRC main.cpp)
 add_executable(hal ${SRC})
 set_target_properties(hal PROPERTIES OUTPUT_NAME "hal")
 set_target_properties(hal PROPERTIES ENABLE_EXPORTS 1)
+set_target_properties(hal PROPERTIES INSTALL_RPATH "${CMAKE_INSTALL_RPATH}")
 target_compile_options(hal
                        PUBLIC ${COMPILE_OPTIONS_PUBLIC}
                        PRIVATE ${COMPILE_OPTIONS_PRIVATE}

deps/abc/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3.0)
+cmake_minimum_required(VERSION 3.5.0)
 
 include(CMakeParseArguments)
 include(CheckCCompilerFlag)

plugins/gui/CMakeLists.txt

@@ -1,6 +1,6 @@
 option(PL_GUI "PL_GUI" ON)
 if(PL_GUI OR BUILD_ALL_PLUGINS)
-    cmake_minimum_required(VERSION 3.1.0)
+    cmake_minimum_required(VERSION 3.5.0)
 
 
     if(APPLE AND CMAKE_HOST_APPLE AND NOT Qt5_DIR)

plugins/simulator/netlist_simulator_controller/saleae_cli/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.5.0)
 project(
   saleae_cli
   VERSION 0.0.1

tools/genversion.py

@@ -28,8 +28,8 @@ def _execute_git_describe(cmd, regex_str, workdir):
         "git describe --tags --match \"v[0-9]*\" --dirty="" --always --abbrev=9"
         ]
     regex_strings = [
-        "v((?P<major>\d+)\.(?P<minor>\d+)\.?(?P<patch>\d+)?(\.?(?P<tweak>\d+))?)(-(?P<add_commit>\d+))?(-g(?P<hash>[0-9,a-f]{9}))?(-(?P<dirty>dirty))?(-(?P<broken>broken))?",
-        "v((?P<major>\d+)\.(?P<minor>\d+)\.?(?P<patch>\d+)?(\.?(?P<tweak>\d+))?)(-(?P<add_commit>\d+))?(-g(?P<hash>[0-9,a-f]{9}))?(-(?P<dirty>dirty))?"
+        "v((?P<major>\\d+)\\.(?P<minor>\\d+)\\.?(?P<patch>\\d+)?(\\.?(?P<tweak>\\d+))?)(-(?P<add_commit>\\d+))?(-g(?P<hash>[0-9,a-f]{9}))?(-(?P<dirty>dirty))?(-(?P<broken>broken))?",
+        "v((?P<major>\\d+)\\.(?P<minor>\\d+)\\.?(?P<patch>\\d+)?(\\.?(?P<tweak>\\d+))?)(-(?P<add_commit>\\d+))?(-g(?P<hash>[0-9,a-f]{9}))?(-(?P<dirty>dirty))?"
         ]
 
     result, r = _execute_git_describe(commands[0], regex_strings[0], workdir)