small mod macos

This commit is contained in:
alemuntoni 2020-10-16 17:05:27 +02:00
parent 4615ed0043
commit d03e996fe3
2 changed files with 5 additions and 6 deletions

View File

@ -58,7 +58,6 @@ find_package(OpenCTM)
find_package(Qhull COMPONENTS libqhull)
find_package(OpenMP)
set (CMAKE_CXX_STANDARD 11)
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
if(WIN32 OR APPLE)
@ -100,9 +99,9 @@ if(INSTALL_TO_UNIX_LAYOUT)
set(MESHLAB_SAMPLE_INSTALL_DIR ${CMAKE_INSTALL_DATAROOTDIR}/meshlab)
elseif(APPLE)
set(MESHLAB_BIN_INSTALL_DIR .)
set(MESHLAB_LIB_INSTALL_DIR .)
set(MESHLAB_PLUGIN_INSTALL_DIR plugins)
set(MESHLAB_SHADER_INSTALL_DIR shaders)
set(MESHLAB_LIB_INSTALL_DIR meshlab.app/Contents/Frameworks)
set(MESHLAB_PLUGIN_INSTALL_DIR meshlab.app/Contents/PlugIns)
set(MESHLAB_SHADER_INSTALL_DIR meshlab.app/Contents/shaders)
set(MESHLAB_SAMPLE_INSTALL_DIR .)
else()
set(MESHLAB_BIN_INSTALL_DIR .)

View File

@ -76,7 +76,7 @@ set(UI
set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/ui)
if(WIN32)
list(APPEND SOURCES meshlab.rc)
list(APPEND SOURCES meshlab.rc)
endif()
add_executable(meshlab WIN32 MACOSX_BUNDLE
@ -97,7 +97,7 @@ set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/images/meshlab.icns PROP
install(
TARGETS meshlab
DESTINATION ${MESHLAB_BIN_INSTALL_DIR}
COMPONENT MeshLab)
COMPONENT MeshLab)
if(Qt5_windeployqt_EXECUTABLE AND BUILD_WITH_WINDEPLOYQT_POST_BUILD)
add_custom_command(