pviktori / rpms / ompl

Forked from rpms/ompl 4 years ago
Clone
Blob Blame History Raw
diff -up ./ompl-0.11.1-Source/CMakeLists.txt.fedora ./ompl-0.11.1-Source/CMakeLists.txt
--- ./ompl-0.11.1-Source/CMakeLists.txt.fedora	2012-07-26 10:16:30.000000000 -0400
+++ ./ompl-0.11.1-Source/CMakeLists.txt	2012-08-06 12:50:34.163944174 -0400
@@ -27,6 +27,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}")
 
@@ -80,7 +82,7 @@ if (NOT MSVC)
   set(PKG_OMPL_LIBS "-lompl")
   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/
+  install(FILES ${pkg_conf_file} DESTINATION ${OMPL_LIB_INSTALL_DIR}/pkgconfig/
     COMPONENT pkgconfig RENAME "ompl${OMPL_INSTALL_SUFFIX}.pc")
 
   install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/doc/dox/FindOMPL.cmake"
diff -up ./ompl-0.11.1-Source/src/CMakeLists.txt.fedora ./ompl-0.11.1-Source/src/CMakeLists.txt
--- ./ompl-0.11.1-Source/src/CMakeLists.txt.fedora	2012-08-06 12:54:27.446819515 -0400
+++ ./ompl-0.11.1-Source/src/CMakeLists.txt	2012-08-06 12:54:36.941560225 -0400
@@ -8,7 +8,7 @@ install(DIRECTORY ompl/ DESTINATION "inc
     REGEX "/doc$" EXCLUDE
     REGEX "/tests$" EXCLUDE)
 
-install(DIRECTORY external/omplext_odeint/ DESTINATION "include/omplext_odeint${OMPL_INSTALL_SUFFIX}")
+install(DIRECTORY external/omplext_odeint/ DESTINATION "include/ompl/omplext_odeint${OMPL_INSTALL_SUFFIX}")
 
 # Add target to install Py++ and its dependencies pygccxml and gccxml
 if (APPLE)
diff -up ./ompl-0.11.1-Source/src/ompl/CMakeLists.txt.fedora ./ompl-0.11.1-Source/src/ompl/CMakeLists.txt
--- ./ompl-0.11.1-Source/src/ompl/CMakeLists.txt.fedora	2012-07-26 10:16:30.000000000 -0400
+++ ./ompl-0.11.1-Source/src/ompl/CMakeLists.txt	2012-08-06 12:50:34.163944174 -0400
@@ -68,7 +68,7 @@ else(MSVC)
 endif(MSVC)
 
 # install the library
-install(TARGETS ompl DESTINATION lib/)
+install(TARGETS ompl DESTINATION ${OMPL_LIB_INSTALL_DIR})
 if(NOT MSVC)
     get_target_property(OMPL_LIBRARY_LOC ompl LOCATION)
     add_custom_command(TARGET ompl POST_BUILD