From d03e996fe36f7d91b8875e2fefff08fab1fa65dd Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Fri, 16 Oct 2020 17:05:27 +0200 Subject: [PATCH] small mod macos --- src/CMakeLists.txt | 7 +++---- src/meshlab/CMakeLists.txt | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 175c96e58..663f5cde2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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 .) diff --git a/src/meshlab/CMakeLists.txt b/src/meshlab/CMakeLists.txt index 978b21449..c3a28b562 100644 --- a/src/meshlab/CMakeLists.txt +++ b/src/meshlab/CMakeLists.txt @@ -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(