Merge pull request #766 from doronbehar/CMAKE_INSTALL_FULL

cmake/pkgconfig: use CMAKE_INSTALL_FULL_* variables
gnuradio · Jul 29, 2024 · bd4694d · bd4694d
2 parents 6cfa5b2 + 23263cb
commit bd4694d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -220,12 +220,6 @@ include(GNUInstallDirs)
 ########################################################################
 # Setup the package config file
 ########################################################################
-#set variables found in the pc.in file
-set(prefix ${CMAKE_INSTALL_PREFIX})
-set(exec_prefix "\${prefix}")
-set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
-set(includedir "\${prefix}/include")
-
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tmpl/volk.pc.in
                ${CMAKE_CURRENT_BINARY_DIR}/volk.pc @ONLY)
 

diff --git a/tmpl/volk.pc.in b/tmpl/volk.pc.in
@@ -1,7 +1,7 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
 LV_CXXFLAGS=@LV_CXXFLAGS@