diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 61543611a..e0685a4b6 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -162,4 +162,7 @@ if (WIN32) PROPERTY ARCHIVE_OUTPUT_DIRECTORY ${MESHLAB_LIB_OUTPUT_DIR}) endif() +set_target_properties(meshlab-common PROPERTIES + INSTALL_RPATH "${MESHLAB_LIB_INSTALL_DIR}:${INSTALL_RPATH}") + install(TARGETS meshlab-common DESTINATION ${MESHLAB_LIB_INSTALL_DIR}) diff --git a/src/external/glew.cmake b/src/external/glew.cmake index ea675fb30..f59f81c8e 100644 --- a/src/external/glew.cmake +++ b/src/external/glew.cmake @@ -41,6 +41,12 @@ elseif(ALLOW_BUNDLED_GLEW AND EXISTS "${GLEW_DIR}/src/glew.c") endif() set_property(TARGET external-glew PROPERTY FOLDER External) + set_property(TARGET external-glew + PROPERTY RUNTIME_OUTPUT_DIRECTORY ${MESHLAB_LIB_OUTPUT_DIR}) + + set_property(TARGET external-glew + PROPERTY LIBRARY_OUTPUT_DIRECTORY ${MESHLAB_LIB_OUTPUT_DIR}) + target_link_libraries(external-glew PRIVATE external-disable-warnings) install(TARGETS external-glew DESTINATION ${MESHLAB_LIB_INSTALL_DIR}) else() diff --git a/src/meshlabplugins/edit_point/CMakeLists.txt b/src/meshlabplugins/edit_point/CMakeLists.txt index 9540c77eb..10aab2838 100644 --- a/src/meshlabplugins/edit_point/CMakeLists.txt +++ b/src/meshlabplugins/edit_point/CMakeLists.txt @@ -10,4 +10,4 @@ set(RESOURCES edit_point.qrc) add_meshlab_plugin(edit_point ${SOURCES} ${HEADERS} ${RESOURCES}) -target_link_libraries(edit_point PUBLIC meshlab-common OpenGL::GLU) +target_link_libraries(edit_point PUBLIC OpenGL::GLU)