Merge pull request #98 from SpatioTemporal/shared-library

Shared library improvements
SpatioTemporal · Sep 9, 2021 · 5e7eb75 · 5e7eb75
2 parents 62fe853 + 75ed2c6
commit 5e7eb75
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 cmake_minimum_required(VERSION 3.18)
 
-project(STARE VERSION 1.2.3
+project(STARE VERSION 1.2.4
 	      DESCRIPTION  "SpatioTemporal Adaptive Resolution Encoding for combining diverse geodata."
 	      HOMEPAGE_URL "https://github.com/SpatioTemporal/STARE")
 
@@ -21,6 +21,7 @@ option(STARE_INCLUDE_PACKAGING "Include packaging rules for STARE" "${is_top_lev
 
 option(CUTE_INCLUDE_DIR "Location of the CUTE headers." ON )
 option(STARE_BUILD_APPS "Build bundled STARE apps." OFF )
+option(STARE_INSTALL_LIBDIR "Destination of libs." "lib")
 
 if(DEFINED ENV{CUTE_INCLUDE_DIR})
     set( CUTE_INCLUDE_DIR $ENV{CUTE_INCLUDE_DIR} )

diff --git a/NOTES b/NOTES
@@ -1,4 +1,9 @@
 
+* 2021-0909 Version 1.2.4b
+
+Improved CMake configuration for building both shared and static
+versions. Working around GNUInstallDirs.
+
 * 2021-0907 Version 1.2.3b
 
 Improved CMake configuration for building both shared and static versions.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.2.3
+1.2.4
diff --git a/packaging/CMakeLists.txt b/packaging/CMakeLists.txt
@@ -2,17 +2,25 @@
 include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 
+
+if (NOT DEFINED STARE_INSTALL_LIBDIR)
+   set(STARE_INSTALL_LIBDIR "${CMAKE_INSTALL_LIBDIR}"
+       CACHE STRING "Path to library files")
+endif()
+
 if (NOT DEFINED STARE_INSTALL_CMAKEDIR)
-   set(STARE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/STARE"
+   set(STARE_INSTALL_CMAKEDIR "${STARE_INSTALL_LIBDIR}/cmake/STARE"
        CACHE STRING "Path to STARE CMake files")
 endif ()
 
+# message( "STARE_INSTALL_CMAKEDIR: ${STARE_INSTALL_CMAKEDIR}" )
+# message( "STARE_INSTALL_LIBDIR:   ${STARE_INSTALL_LIBDIR}" )
+# message( "CMAKE_INSTALL_LIBDIR:   ${CMAKE_INSTALL_LIBDIR}" )
 
 install(TARGETS STARE EXPORT STARE_Targets
         RUNTIME COMPONENT STARE_Runtime
-        LIBRARY COMPONENT STARE_Runtime
-        NAMELINK_COMPONENT STARE_Development
-        ARCHIVE COMPONENT STARE_Development
+        LIBRARY DESTINATION "${STARE_INSTALL_LIBDIR}" COMPONENT STARE_Runtime NAMELINK_COMPONENT STARE_Development
+        ARCHIVE DESTINATION "${STARE_INSTALL_LIBDIR}" COMPONENT STARE_Development
         INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/STARE")
 
 install(DIRECTORY "${STARE_BINARY_DIR}/src/include/STARE"