diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e2dcecb3b..b5cfbaeb9b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,11 @@ LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmakemodules") # Directory fo # The root directory for all MRPT libraries/modules: SET(MRPT_LIBS_ROOT "${CMAKE_SOURCE_DIR}/libs" CACHE INTERNAL "") # This emulates global vars +# Windows default: lib. Debian pkgs: set from outside rules script +IF(NOT DEFINED CMAKE_INSTALL_LIBDIR) + SET(CMAKE_INSTALL_LIBDIR "lib") +ENDIF(NOT DEFINED CMAKE_INSTALL_LIBDIR) + # --------------------------------------------------------------------------- # Create the minimum list of libraries required by an application that # uses the MRPT C++ library. This must be passed to "TARGET_LINK_LIBRARIES" diff --git a/cmakemodules/DeclareMRPTLib.cmake b/cmakemodules/DeclareMRPTLib.cmake index 6c77d32852..4eb048be10 100644 --- a/cmakemodules/DeclareMRPTLib.cmake +++ b/cmakemodules/DeclareMRPTLib.cmake @@ -253,7 +253,7 @@ macro(internal_define_mrpt_lib name headers_only) IF(CMAKE_MRPT_USE_DEB_POSTFIXS) SET(MRPT_PREFIX_INSTALL "${CMAKE_INSTALL_PREFIX}/libmrpt-${name}${CMAKE_MRPT_VERSION_NUMBER_MAJOR}.${CMAKE_MRPT_VERSION_NUMBER_MINOR}/usr/") ELSE(CMAKE_MRPT_USE_DEB_POSTFIXS) - SET(MRPT_PREFIX_INSTALL "${CMAKE_INSTALL_PREFIX}") + SET(MRPT_PREFIX_INSTALL "") ENDIF(CMAKE_MRPT_USE_DEB_POSTFIXS) # make sure the library gets installed diff --git a/cmakemodules/script_setup_cpack.cmake b/cmakemodules/script_setup_cpack.cmake index 97f79c4ea7..cdaa61b053 100644 --- a/cmakemodules/script_setup_cpack.cmake +++ b/cmakemodules/script_setup_cpack.cmake @@ -12,6 +12,7 @@ SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md") SET(CPACK_RESOURCE_FILE_WELCOME "${CMAKE_CURRENT_SOURCE_DIR}/README.md") SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "MRPT is a set of C++ libraries and applications for mobile robot software development.") FILE(READ ${CPACK_PACKAGE_DESCRIPTION_FILE} CPACK_DESCRIPTION_TEXT) +STRING(REGEX REPLACE "\"" "" CPACK_DESCRIPTION_TEXT ${CPACK_DESCRIPTION_TEXT}) # It seems \" characters break NSIS. SET(CPACK_PACKAGE_VERSION_MAJOR "${CMAKE_MRPT_VERSION_NUMBER_MAJOR}") SET(CPACK_PACKAGE_VERSION_MINOR "${CMAKE_MRPT_VERSION_NUMBER_MINOR}")