Skip to content

Commit

Permalink
Merge pull request #87 from j-rivero/install_config_multiarch
Browse files Browse the repository at this point in the history
Install cmake modules into arch dependent path
  • Loading branch information
jacquelinekay committed Apr 12, 2016
2 parents 17588e4 + d5c2fa0 commit 1ac193c
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ message (STATUS "${PROJECT_NAME} version ${URDF_VERSION}")

include(GNUInstallDirs)

# hack: by default this would be 'lib/x86_64-linux-gnu'
set(CMAKE_INSTALL_LIBDIR lib)

# set the default build type
if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release)
Expand Down Expand Up @@ -62,7 +59,7 @@ add_subdirectory(urdf_parser)
if(WIN32 AND NOT CYGWIN)
set(CMAKE_CONFIG_INSTALL_DIR CMake)
else()
set(CMAKE_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake/)
set(CMAKE_CONFIG_INSTALL_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}/cmake/)
endif()

set(PKG_NAME ${PROJECT_NAME})
Expand Down

0 comments on commit 1ac193c

Please sign in to comment.