Relocating installed CMake data files from lib to share as they are arch independent

Author: gershnik

CMakeLists.txt

@@ -16,20 +16,18 @@ string(STRIP ${SYSSTR_VERSION} SYSSTR_VERSION)
 
 project(sys_string VERSION ${SYSSTR_VERSION} LANGUAGES CXX)
 
-find_package (Python3 COMPONENTS Interpreter Development)
-
-if (PROJECT_IS_TOP_LEVEL)
+option(BUILD_TESTING "Enable testing" ${PROJECT_IS_TOP_LEVEL})
 
-    set(SYS_STRING_CONFIGURE_INSTALL ON)
+find_package (Python3 COMPONENTS Interpreter Development)
 
-else()
+add_subdirectory(lib)
 
-    set(SYS_STRING_CONFIGURE_INSTALL ON)
+if (PROJECT_IS_TOP_LEVEL)
+    
+    include(lib/cmake/install.cmake)
 
 endif()
 
-add_subdirectory(lib)
-
 if(${Python3_Interpreter_FOUND} AND "${Python3_VERSION}" VERSION_GREATER_EQUAL "3.9")
 
     file(GLOB UNICODE_DATA ${CMAKE_CURRENT_LIST_DIR}/unicode/data/*.txt)
@@ -70,8 +68,9 @@ if(${Python3_Interpreter_FOUND} AND "${Python3_VERSION}" VERSION_GREATER_EQUAL "
 
 endif()
 
-if (PROJECT_IS_TOP_LEVEL)
-    
+if (BUILD_TESTING)
+
+    enable_testing()
     add_subdirectory(test)
 
 endif()

lib/CMakeLists.txt

@@ -100,7 +100,7 @@ PRIVATE
 
 add_library(${LIBNAME}::${LIBNAME} ALIAS ${LIBNAME})
 
-if (PROJECT_IS_TOP_LEVEL OR SYS_STRING_CONFIGURE_INSTALL)
+if (PROJECT_IS_TOP_LEVEL)
 
     include(cmake/install.cmake)
 

lib/cmake/install.cmake

@@ -10,13 +10,18 @@ include(GNUInstallDirs)
 include(CMakePackageConfigHelpers)
 
 install(TARGETS sys_string EXPORT sys_string FILE_SET HEADERS DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-install(EXPORT sys_string NAMESPACE sys_string:: FILE sys_string-exports.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/sys_string)
+install(EXPORT sys_string NAMESPACE sys_string:: FILE sys_string-exports.cmake DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/sys_string)
+
+# Clean the old CMAKE_INSTALL_LIBDIR location where things were previously put
+# on older versions
+install(CODE "file(REMOVE_RECURSE \"\$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/sys_string\")")
+
 
 configure_package_config_file(
         ${CMAKE_CURRENT_LIST_DIR}/sys_string-config.cmake.in
         ${CMAKE_CURRENT_BINARY_DIR}/sys_string-config.cmake
     INSTALL_DESTINATION
-        ${CMAKE_INSTALL_LIBDIR}/sys_string
+        ${CMAKE_INSTALL_DATAROOTDIR}/sys_string
 )
 
 write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/sys_string-config-version.cmake
@@ -28,7 +33,7 @@ install(
         ${CMAKE_CURRENT_BINARY_DIR}/sys_string-config.cmake
         ${CMAKE_CURRENT_BINARY_DIR}/sys_string-config-version.cmake
     DESTINATION
-        ${CMAKE_INSTALL_LIBDIR}/sys_string
+        ${CMAKE_INSTALL_DATAROOTDIR}/sys_string
 )
 
 file(RELATIVE_PATH FROM_PCFILEDIR_TO_PREFIX ${CMAKE_INSTALL_FULL_DATAROOTDIR}/sys_string ${CMAKE_INSTALL_PREFIX})

lib/cmake/sys_string.pc.in

@@ -5,6 +5,4 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
 Name: sys_string
 Description: C++ string classes optimized for interoperability with external native string types.
 Version: @PROJECT_VERSION@
-Requires:
 Cflags: -I${includedir}
-Libs: