From cb178db0c8210267e3d143a92c0c7c6684e411cc Mon Sep 17 00:00:00 2001 From: Wolfgang Merkt Date: Wed, 27 Nov 2019 20:41:40 +0000 Subject: [PATCH 1/2] Do not modify source directory (for read-only file systems) --- dynamicEDT3D/CMakeLists.txt | 2 +- octomap/CMakeLists.txt | 2 +- octovis/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dynamicEDT3D/CMakeLists.txt b/dynamicEDT3D/CMakeLists.txt index 78aa8515..7b71429d 100644 --- a/dynamicEDT3D/CMakeLists.txt +++ b/dynamicEDT3D/CMakeLists.txt @@ -25,7 +25,7 @@ INCLUDE(CompilerSettings) # Set output directories for libraries and executables -SET( BASE_DIR ${CMAKE_SOURCE_DIR} ) +SET( BASE_DIR ${CMAKE_CURRENT_BINARY_DIR} ) SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${BASE_DIR}/lib ) SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${BASE_DIR}/lib ) SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${BASE_DIR}/bin ) diff --git a/octomap/CMakeLists.txt b/octomap/CMakeLists.txt index 5e2bc374..7680f763 100644 --- a/octomap/CMakeLists.txt +++ b/octomap/CMakeLists.txt @@ -35,7 +35,7 @@ IF(OCTOMAP_OMP) ENDIF(OCTOMAP_OMP) # Set output directories for libraries and executables -SET( BASE_DIR ${CMAKE_SOURCE_DIR} ) +SET( BASE_DIR ${CMAKE_CURRENT_BINARY_DIR} ) SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${BASE_DIR}/lib ) SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${BASE_DIR}/lib ) SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${BASE_DIR}/bin ) diff --git a/octovis/CMakeLists.txt b/octovis/CMakeLists.txt index 255da0a8..9bef70b9 100644 --- a/octovis/CMakeLists.txt +++ b/octovis/CMakeLists.txt @@ -24,7 +24,7 @@ SET (CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/CMakeModules") INCLUDE(CompilerSettings) # Set output directories for libraries and executables -SET( BASE_DIR ${CMAKE_SOURCE_DIR} ) +SET( BASE_DIR ${CMAKE_CURRENT_BINARY_DIR} ) SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY ${BASE_DIR}/lib ) SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${BASE_DIR}/lib ) SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY ${BASE_DIR}/bin ) From dbb47d8ab159d7a69c3d57ae8c12890f79d50428 Mon Sep 17 00:00:00 2001 From: Wolfgang Merkt Date: Wed, 27 Nov 2019 21:00:09 +0000 Subject: [PATCH 2/2] octovis: link publicly, minor clean-up --- octovis/CMakeLists_src.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/octovis/CMakeLists_src.txt b/octovis/CMakeLists_src.txt index 1f800c2d..86d51dc9 100644 --- a/octovis/CMakeLists_src.txt +++ b/octovis/CMakeLists_src.txt @@ -104,7 +104,7 @@ target_link_libraries(octovis-static) set_target_properties(octovis-static PROPERTIES OUTPUT_NAME octovis) add_library(octovis-shared SHARED ${viewerlib_SRCS}) -target_link_libraries(octovis-shared +target_link_libraries(octovis-shared PUBLIC ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${OCTOMAP_LIBRARIES} @@ -129,9 +129,7 @@ endif() add_executable(octovis ${viewer_SRCS} ${viewer_UIS_H} ${viewer_MOC_SRCS} ${viewer_RES}) target_link_libraries(octovis -# ${QGLViewer_LIBRARIES} ${QT_LIBRARIES} - ${OCTOMAP_LIBRARIES} octovis-shared )