CMakeLists.txt

@@ -94,7 +94,6 @@ INCLUDE(cmake/checks.cmake)
 set(CMAKE_INSTALL_RPATH
    ${CMAKE_INSTALL_RPATH}
    ${CMAKE_INSTALL_PREFIX}/${SD_LIBDIR}/lib
-   /usr/${SD_LIBDIR}/lib
 )
 
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)

INSTALL.txt

@@ -225,12 +225,6 @@ The Speed Dreams Team.
             Enable building against 3rd party Expat 2 library, rather than bundled txml (def: ON)
             Disable if "Expat 2 dev" is not available for your distro.
 
-        - OPTION_3RDPARTY_SOLID:BOOL :
-            Enable building against 3rd party Free Solid 2 library, rather than bundled one (def: OFF)
-            Note: This is not set by default, because Free Solid 2 dev is not yet available
-                  on most Linux distros (amongst the big ones only Fedora has it right now, in 2018, August)
-                  Ask the dev team for any hint about building it ...
-
         - OPTION_OSGGRAPH:BOOL :
             Enable building of the WIP new OpenSceneGraph-based graphics module 'osggraph' (def: ON)
             Note: This requires new 3rd party libs : OpenSceneGraph

cmake/FindSOLID.cmake

@@ -20,9 +20,9 @@ ENDIF(SOLID_FOUND)
 FIND_PACKAGE(PkgConfig)
 IF(PKGCONFIG_FOUND)
 
-  PKG_CHECK_MODULES(SOLID FreeSOLID)
+  PKG_CHECK_MODULES(SOLID FreeSOLID IMPORTED_TARGET)
   IF(NOT SOLID_FOUND)
-    PKG_CHECK_MODULES(SOLID SOLID)
+    PKG_CHECK_MODULES(SOLID SOLID IMPORTED_TARGET)
   ENDIF (NOT SOLID_FOUND)
 
   IF(SOLID_FOUND)
@@ -33,6 +33,7 @@ IF(PKGCONFIG_FOUND)
     SET(SOLID_MOTO_LIBRARY "NOT-FOUND" CACHE STRING "MOTO libraries")
     SET(SOLID_LIBRARY ${SOLID_SOLID_LIBRARY})
     MESSAGE(STATUS "Looking for SOLID --- found using pkg-config (${SOLID_SOLID_LIBRARY})")
+    add_library(solid ALIAS PkgConfig::SOLID)
     RETURN()
   ENDIF(SOLID_FOUND)