diff -up ./dynamicEDT3D/CMakeLists.txt.libdir ./dynamicEDT3D/CMakeLists.txt
--- ./dynamicEDT3D/CMakeLists.txt.libdir 2014-05-26 05:20:16.000000000 -0400
+++ ./dynamicEDT3D/CMakeLists.txt 2014-06-09 22:00:40.089706266 -0400
@@ -35,8 +35,8 @@ LINK_DIRECTORIES(${CMAKE_LIBRARY_OUTPUT_
set(INSTALL_TARGETS_DEFAULT_ARGS
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
)
find_package(octomap REQUIRED
@@ -85,7 +85,7 @@ configure_file(dynamicEDT3DConfig-versio
# Create a dynamicEDT3DConfig.cmake file for the use from the install tree
# and install it
set(DYNAMICEDT3D_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include")
-set(DYNAMICEDT3D_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+set(DYNAMICEDT3D_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
#set(DYNAMICEDT3D_CMAKE_DIR "${INSTALL_DATA_DIR}/FooBar/CMake")
configure_file(dynamicEDT3DConfig.cmake.in
"${PROJECT_BINARY_DIR}/InstallFiles/dynamicEDT3DConfig.cmake" @ONLY)
@@ -94,7 +94,7 @@ configure_file(dynamicEDT3DConfig-versio
install(FILES
"${PROJECT_BINARY_DIR}/InstallFiles/dynamicEDT3DConfig.cmake"
"${PROJECT_BINARY_DIR}/InstallFiles/dynamicEDT3DConfig-version.cmake"
- DESTINATION lib/cmake/dynamicEDT3D/)
+ DESTINATION lib${LIB_SUFFIX}/cmake/dynamicEDT3D/)
# Write pkgconfig-file:
include(InstallPkgConfigFile)
diff -up ./dynamicEDT3D/CMakeModules/InstallPkgConfigFile.cmake.libdir ./dynamicEDT3D/CMakeModules/InstallPkgConfigFile.cmake
--- ./dynamicEDT3D/CMakeModules/InstallPkgConfigFile.cmake.libdir 2014-06-09 22:02:03.235837230 -0400
+++ ./dynamicEDT3D/CMakeModules/InstallPkgConfigFile.cmake 2014-06-09 22:02:57.308881567 -0400
@@ -63,7 +63,7 @@ function(install_pkg_config_file)
# write the .pc file out
file(WRITE ${pc_fname}
"prefix=${CMAKE_INSTALL_PREFIX}\n"
- "libdir=\${prefix}/lib\n"
+ "libdir=\${prefix}/lib${LIB_SUFFIX}\n"
"includedir=\${prefix}/include\n"
"\n"
"Name: ${pc_name}\n"
@@ -74,5 +74,5 @@ function(install_pkg_config_file)
"Cflags: -I\${includedir} ${pc_cflags}\n")
# mark the .pc file for installation to the lib/pkgconfig directory
- install(FILES ${pc_fname} DESTINATION lib/pkgconfig)
+ install(FILES ${pc_fname} DESTINATION lib${LIB_SUFFIX}/pkgconfig)
endfunction(install_pkg_config_file)
diff -up ./octomap/CMakeLists.txt.libdir ./octomap/CMakeLists.txt
--- ./octomap/CMakeLists.txt.libdir 2014-05-26 05:20:16.000000000 -0400
+++ ./octomap/CMakeLists.txt 2014-06-09 22:00:40.089706266 -0400
@@ -45,8 +45,8 @@ LINK_DIRECTORIES(${CMAKE_LIBRARY_OUTPUT_
set(INSTALL_TARGETS_DEFAULT_ARGS
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
)
ADD_SUBDIRECTORY( src/math )
@@ -92,7 +92,7 @@ configure_file(octomap-config-version.cm
# Create a octomap-config.cmake file for the use from the install tree
# and install it
set(OCTOMAP_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include")
-set(OCTOMAP_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+set(OCTOMAP_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
#set(OCTOMAP_CMAKE_DIR "${INSTALL_DATA_DIR}/FooBar/CMake")
configure_file(octomap-config.cmake.in
"${PROJECT_BINARY_DIR}/InstallFiles/octomap-config.cmake" @ONLY)
diff -up ./octomap/CMakeModules/InstallPkgConfigFile.cmake.libdir ./octomap/CMakeModules/InstallPkgConfigFile.cmake
--- ./octomap/CMakeModules/InstallPkgConfigFile.cmake.libdir 2014-05-26 05:20:16.000000000 -0400
+++ ./octomap/CMakeModules/InstallPkgConfigFile.cmake 2014-06-09 22:00:40.089706266 -0400
@@ -63,7 +63,7 @@ function(install_pkg_config_file)
# write the .pc file out
file(WRITE ${pc_fname}
"prefix=${CMAKE_INSTALL_PREFIX}\n"
- "libdir=\${prefix}/lib\n"
+ "libdir=\${prefix}/lib${LIB_SUFFIX}\n"
"includedir=\${prefix}/include\n"
"\n"
"Name: ${pc_name}\n"
@@ -74,5 +74,5 @@ function(install_pkg_config_file)
"Cflags: -I\${includedir} ${pc_cflags}\n")
# mark the .pc file for installation to the lib/pkgconfig directory
- install(FILES ${pc_fname} DESTINATION lib/pkgconfig)
+ install(FILES ${pc_fname} DESTINATION lib${LIB_SUFFIX}/pkgconfig)
endfunction(install_pkg_config_file)
diff -up ./octovis/CMakeLists.txt.libdir ./octovis/CMakeLists.txt
--- ./octovis/CMakeLists.txt.libdir 2014-05-26 05:20:16.000000000 -0400
+++ ./octovis/CMakeLists.txt 2014-06-09 22:00:40.090706303 -0400
@@ -43,8 +43,8 @@ export(PACKAGE octovis)
set(INSTALL_TARGETS_DEFAULT_ARGS
RUNTIME DESTINATION bin
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
)
# Builds the "octovis" viewer based on OpenGL and
@@ -89,7 +89,7 @@ IF(BUILD_VIEWER)
# Create a octovis-config.cmake file for the use from the install tree
# and install it
set(OCTOVIS_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include")
- set(OCTOVIS_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+ set(OCTOVIS_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
#set(OCTOMAP_CMAKE_DIR "${INSTALL_DATA_DIR}/FooBar/CMake")
configure_file(octovis-config.cmake.in
"${PROJECT_BINARY_DIR}/InstallFiles/octovis-config.cmake" @ONLY)