pviktori / rpms / ompl

Forked from rpms/ompl 4 years ago
Clone
Blob Blame History Raw
diff -up ./CMakeLists.txt.fedora ./CMakeLists.txt
--- ./CMakeLists.txt.fedora	2014-03-14 14:32:59.000000000 -0400
+++ ./CMakeLists.txt	2014-05-30 21:18:22.407055489 -0400
@@ -35,6 +35,8 @@ set(OMPL_DEMO_INSTALL_DIR "share/ompl${O
     CACHE STRING "Relative path to directory where demos will be installed")
 set(OMPL_DOC_INSTALL_DIR "share/ompl${OMPL_INSTALL_SUFFIX}/doc"
     CACHE STRING "Relative path to directory where documentation will be installed")
+set(OMPL_LIB_INSTALL_DIR "lib" 
+    CACHE STRING "Relative path to directory where libraries will be installed")
 
 include_directories("${OMPL_INCLUDE_DIR}")
 
@@ -127,7 +129,7 @@ if (TRIANGLE_FOUND)
 endif()
 
 # If FLANN is installed, a wrapper for its nearest neighbor data structures can be used
-find_package(flann 1.8.3 QUIET)
+find_package(flann 1.8.4 QUIET)
 if (FLANN_FOUND)
     set(OMPL_HAVE_FLANN 1)
     include_directories(SYSTEM "${FLANN_INCLUDE_DIRS}")
@@ -156,7 +158,7 @@ if (NOT MSVC)
   set(pkg_conf_file "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/ompl.pc")
   configure_file("${pkg_conf_file}.in" "${pkg_conf_file}" @ONLY)
   install(FILES "${pkg_conf_file}"
-    DESTINATION lib/pkgconfig/
+    DESTINATION ${OMPL_LIB_INSTALL_DIR}/pkgconfig/
     COMPONENT ompl
     RENAME "ompl${OMPL_INSTALL_SUFFIX}.pc")
 
diff -up ./src/ompl/CMakeLists.txt.fedora ./src/ompl/CMakeLists.txt
--- ./src/ompl/CMakeLists.txt.fedora	2013-12-18 15:13:33.000000000 -0500
+++ ./src/ompl/CMakeLists.txt	2014-05-30 21:05:07.389527677 -0400
@@ -75,7 +75,7 @@ endif(MSVC)
 
 # install the library
 install(TARGETS ompl
-    DESTINATION lib/
+    DESTINATION ${OMPL_LIB_INSTALL_DIR} 
     COMPONENT ompl)
 if(NOT MSVC)
     get_target_property(OMPL_LIBRARY_LOC ompl LOCATION)