Fix install path in CMakeConfigs (Followup on #47)

Author: ahornung

dynamicEDT3D/CMakeLists.txt

@@ -84,11 +84,11 @@ set(DYNAMICEDT3D_LIB_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
 # Windows, spec. MSVC requires the .lib suffix for imported libs
 IF(WIN32)
   set(DYNAMICEDT3D_LIBRARY
-    "${DYNAMICEDT3D_LIB_DIR}/${CMAKE_IMPORT_LIBRARY_PREFIX}dynamicedt3d${CMAKE_IMPORT_LIBRARY_SUFFIX}"
+    "${CMAKE_IMPORT_LIBRARY_PREFIX}dynamicedt3d${CMAKE_IMPORT_LIBRARY_SUFFIX}"
   )
 ELSE()
   set(DYNAMICEDT3D_LIBRARY
-    "${DYNAMICEDT3D_LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}dynamicedt3d${CMAKE_SHARED_LIBRARY_SUFFIX}"
+    "${CMAKE_SHARED_LIBRARY_PREFIX}dynamicedt3d${CMAKE_SHARED_LIBRARY_SUFFIX}"
   )
 ENDIF()
 # not used right now (export depends?)

dynamicEDT3D/dynamicEDT3DConfig.cmake.in

@@ -20,4 +20,4 @@ set(DYNAMICEDT3D_LIBRARY_DIRS "@DYNAMICEDT3D_LIB_DIR@")
 # Our library dependencies (contains definitions for IMPORTED targets)
 # include("@FOOBAR_CMAKE_DIR@/FooBarLibraryDepends.cmake")
 
-set(DYNAMICEDT3D_LIBRARIES "@DYNAMICEDT3D_LIBRARY@")
+set(DYNAMICEDT3D_LIBRARIES "@DYNAMICEDT3D_LIB_DIR@/@DYNAMICEDT3D_LIBRARY@")

octomap/CMakeLists.txt

@@ -87,17 +87,17 @@ set(OCTOMAP_LIB_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}")
 # Windows, spec. MSVC requires the .lib suffix for imported libs
 IF(WIN32)
   set(OCTOMAP_LIBRARY
-    "${OCTOMAP_LIB_DIR}/${CMAKE_IMPORT_LIBRARY_PREFIX}octomap${CMAKE_IMPORT_LIBRARY_SUFFIX}"
+    "${CMAKE_IMPORT_LIBRARY_PREFIX}octomap${CMAKE_IMPORT_LIBRARY_SUFFIX}"
   )
   set(OCTOMATH_LIBRARY
-    "${OCTOMAP_LIB_DIR}/${CMAKE_IMPORT_LIBRARY_PREFIX}octomath${CMAKE_IMPORT_LIBRARY_SUFFIX}"
+    "${CMAKE_IMPORT_LIBRARY_PREFIX}octomath${CMAKE_IMPORT_LIBRARY_SUFFIX}"
   )
 ELSE()
   set(OCTOMAP_LIBRARY
-    "${OCTOMAP_LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}octomap${CMAKE_SHARED_LIBRARY_SUFFIX}"
+    "${CMAKE_SHARED_LIBRARY_PREFIX}octomap${CMAKE_SHARED_LIBRARY_SUFFIX}"
   )
   set(OCTOMATH_LIBRARY
-    "${OCTOMAP_LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}octomath${CMAKE_SHARED_LIBRARY_SUFFIX}"
+    "${CMAKE_SHARED_LIBRARY_PREFIX}octomath${CMAKE_SHARED_LIBRARY_SUFFIX}"
   )
 ENDIF()
 
@@ -114,6 +114,7 @@ configure_file(octomap-config-version.cmake.in
 set(OCTOMAP_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include")
 set(OCTOMAP_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
 #set(OCTOMAP_CMAKE_DIR "${INSTALL_DATA_DIR}/FooBar/CMake")
+
 configure_file(octomap-config.cmake.in
   "${PROJECT_BINARY_DIR}/InstallFiles/octomap-config.cmake" @ONLY)
 configure_file(octomap-config-version.cmake.in

octomap/octomap-config.cmake.in

@@ -29,6 +29,6 @@ set(OCTOMAP_LIBRARY_DIRS "@OCTOMAP_LIB_DIR@")
 
 # Set library names
 set(OCTOMAP_LIBRARIES 
-  "@OCTOMAP_LIBRARY@"
-  "@OCTOMATH_LIBRARY@"
+  "@OCTOMAP_LIB_DIR@/@OCTOMAP_LIBRARY@"
+  "@OCTOMAP_LIB_DIR@/@OCTOMATH_LIBRARY@"
 )

octovis/CMakeLists.txt

@@ -90,11 +90,11 @@ IF(BUILD_VIEWER)
   # Windows, spec. MSVC requires the .lib suffix for imported libs
   IF(WIN32)
     set(OCTOVIS_LIBRARY
-      "${OCTOVIS_LIB_DIR}/${CMAKE_IMPORT_LIBRARY_PREFIX}octovis${CMAKE_IMPORT_LIBRARY_SUFFIX}"
+      "${CMAKE_IMPORT_LIBRARY_PREFIX}octovis${CMAKE_IMPORT_LIBRARY_SUFFIX}"
     )
   ELSE()
     set(OCTOVIS_LIBRARY
-      "${OCTOVIS_LIB_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}octovis${CMAKE_SHARED_LIBRARY_SUFFIX}"
+      "${CMAKE_SHARED_LIBRARY_PREFIX}octovis${CMAKE_SHARED_LIBRARY_SUFFIX}"
     )
   ENDIF()
 

octovis/octovis-config.cmake.in

@@ -13,5 +13,5 @@ set(OCTOVIS_LIBRARY_DIRS "@QGLViewer_LIBRARY_DIR@" "@OCTOVIS_LIB_DIR@")
 set(OCTOVIS_LIBRARIES
   "@QGLViewer_LIBRARIES@"
   "@QT_LIBRARIES@"
-  "@OCTOVIS_LIBRARY@"
+  "@OCTOVIS_LIB_DIR@/@OCTOVIS_LIBRARY@"
 )