Fix #44: CMAKE_SHARED_LIBRARY_SUFFIX in CMakeConfig for absolute libr…

…ary paths
OctoMap · Sep 4, 2013 · ac4a2ae · ac4a2ae
1 parent 9056460
commit ac4a2ae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 16 deletions.
diff --git a/octomap/octomap-config.cmake.in b/octomap/octomap-config.cmake.in
@@ -24,15 +24,9 @@
 set(OCTOMAP_INCLUDE_DIRS @OCTOMAP_INCLUDE_DIRS@)
 set(OCTOMAP_LIBRARY_DIRS @OCTOMAP_LIB_DIR@)
 
-# library ext. hardcoded to dylib on Apple 
-if(APPLE)
-  set(SO_EXT ".dylib")
-else(APPLE)
-  set(SO_EXT ".so")
-endif(APPLE)
 
 # Set library names as absolute paths:
 set(OCTOMAP_LIBRARIES
-  @OCTOMAP_LIB_DIR@/liboctomap${SO_EXT}
-  @OCTOMAP_LIB_DIR@/liboctomath${SO_EXT}
+  @OCTOMAP_LIB_DIR@/liboctomap@CMAKE_SHARED_LIBRARY_SUFFIX@
+  @OCTOMAP_LIB_DIR@/liboctomath@CMAKE_SHARED_LIBRARY_SUFFIX@
 )
diff --git a/octovis/octovis-config.cmake.in b/octovis/octovis-config.cmake.in
@@ -9,16 +9,9 @@ set(OCTOVIS_INCLUDE_DIRS @QGLViewer_INCLUDE_DIR@ @OCTOVIS_INCLUDE_DIR@)
 set(OCTOVIS_LIBRARY_DIRS @QGLViewer_LIBRARY_DIR@ @OCTOVIS_LIB_DIR@)
 
 
-# library ext. hardcoded to dylib on Apple 
-if(APPLE)
-  set(SO_EXT ".dylib")
-else(APPLE)
-  set(SO_EXT ".so")
-endif(APPLE)
-
 # Set library names as absolute paths:
 set(OCTOVIS_LIBRARIES
   @QGLViewer_LIBRARIES@
   @QT_LIBRARIES@
-  @OCTOVIS_LIB_DIR@/liboctovis${SO_EXT}
+  @OCTOVIS_LIB_DIR@/liboctovis@CMAKE_SHARED_LIBRARY_SUFFIX@
 )