Skip to content

Commit

Permalink
Fix CPack install in Windows
Browse files Browse the repository at this point in the history
  • Loading branch information
jlblancoc committed Jun 26, 2014
1 parent fcc220d commit c68fe59
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 1 deletion.
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cmakemodules/DeclareMRPTLib.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions cmakemodules/script_setup_cpack.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
Expand Down

0 comments on commit c68fe59

Please sign in to comment.