File gazebo-cmake-link.patch of Package gazebo

Overview Repositories Revisions Requests Users Attributes Meta

File gazebo-cmake-link.patch of Package gazebo

diff -ru gazebo-1.0.0_RC2/CMakeLists.txt gazebo-1.0.0_RC2.patched/CMakeLists.txt
--- gazebo-1.0.0_RC2/CMakeLists.txt	2012-01-13 17:37:07.000000000 +0000
+++ gazebo-1.0.0_RC2.patched/CMakeLists.txt	2012-02-24 09:26:40.915649700 +0000
@@ -18,9 +18,9 @@
 
 message (STATUS "${PROJECT_NAME} version ${GAZEBO_VERSION}")
 
-if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-  set (CMAKE_INSTALL_PREFIX "/usr/" CACHE PATH "Gazebo install prefix" FORCE)
-endif()
+# if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+#   set (CMAKE_INSTALL_PREFIX "/usr/" CACHE PATH "Gazebo install prefix" FORCE)
+# endif()
 
 set (CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 
@@ -34,24 +34,24 @@
   # (but later on when installing)
   set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
   
-  set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+  set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR})
   
   # add the automatically determined parts of the RPATH
   # which point to directories outside the build tree to the install RPATH
   set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
   
   # the RPATH to be used when installing, but only if its not a system directory
-  list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
+  list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ${LIB_INSTALL_DIR} isSystemDir)
   if("${isSystemDir}" STREQUAL "-1")
-    set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+    set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR})
   endif("${isSystemDir}" STREQUAL "-1")
 endif()
 
 set (BUILD_GAZEBO ON CACHE INTERNAL "Build Gazebo" FORCE)
 
 set (INCLUDE_INSTALL_DIR "include/gazebo-${GAZEBO_VERSION}/gazebo")
-set (LIB_INSTALL_DIR "lib")
-set (BIN_INSTALL_DIR "bin")
+# set (LIB_INSTALL_DIR "lib")
+# set (BIN_INSTALL_DIR "bin")
 
 
 # with -fPIC
@@ -215,7 +215,7 @@
 
   foreach (pkgconfig ${pkgconfig_files})
     configure_file(${CMAKE_SOURCE_DIR}/cmake/pkgconfig/${pkgconfig}.in ${CMAKE_CURRENT_BINARY_DIR}/cmake/pkgconfig/${pkgconfig}.pc @ONLY)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/pkgconfig/${pkgconfig}.pc DESTINATION lib/pkgconfig COMPONENT pkgconfig)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/pkgconfig/${pkgconfig}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig COMPONENT pkgconfig)
   endforeach()
 
   ########################################
diff -ru gazebo-1.0.0_RC2/plugins/CMakeLists.txt gazebo-1.0.0_RC2.patched/plugins/CMakeLists.txt
--- gazebo-1.0.0_RC2/plugins/CMakeLists.txt	2012-01-13 17:37:07.000000000 +0000
+++ gazebo-1.0.0_RC2.patched/plugins/CMakeLists.txt	2012-02-24 09:27:39.855912845 +0000
@@ -12,6 +12,6 @@
 foreach (src ${plugins})
   add_library(${src} SHARED ${src}.cc)
   target_link_libraries(${src} gazebo_server)
-  install (TARGETS ${src} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/gazebo-${GAZEBO_VERSION}/plugins/)
+  install (TARGETS ${src} DESTINATION ${LIB_INSTALL_DIR}/gazebo-${GAZEBO_VERSION}/plugins/)
   INSTALL_INCLUDES("plugins" ${src}.hh)
 endforeach (src ${plugins})

Places

File gazebo-cmake-link.patch of Package gazebo

Places