From 954165030c13572047a6b9dd09fc69ef2ac810de Mon Sep 17 00:00:00 2001 From: Ruixiang Du Date: Mon, 22 Jun 2020 00:05:16 +0800 Subject: [PATCH] saved work --- CMakeLists.txt | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index db90456..ab237b7 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,13 +10,8 @@ set(RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/devel) ## Set compiler to use c++ 11 features set(CMAKE_CXX_STANDARD 11) -set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) - -## Put all binary files into /bin and libraries into /lib -# set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) -# set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) -# set(ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +set(CMAKE_CXX_STANDARD_REQUIRED ON) ## Chosse build type # set(CMAKE_BUILD_TYPE Release) @@ -32,6 +27,20 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) "Debug" "Release" "MinSizeRel" "RelWithDebInfo") endif() +## Use GNUInstallDirs to install libraries into correct +# locations on all platforms. +include(GNUInstallDirs) +message(STATUS "Project will be installed to ${CMAKE_INSTALL_PREFIX}") + +## Put all binary files into /bin and libraries into /lib +set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin) +set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib) +set(ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) + +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}) + ## Optionally built modules: ON/OFF set(BUILD_TESTS OFF) set(BUILD_MONITOR ON) @@ -92,10 +101,6 @@ catkin_package( # DEPENDS system_lib ) -## Use GNUInstallDirs to install libraries into correct -# locations on all platforms. -include(GNUInstallDirs) - ## Add catkin install targets install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}