From b9018982e13f7efe430d16103d16d9d7c474e3ad Mon Sep 17 00:00:00 2001 From: Matthias Hochsteger Date: Tue, 10 Jan 2017 18:40:26 +0100 Subject: [PATCH] Differen default install dir on MacOS --- CMakeLists.txt | 6 ------ cmake_modules/SuperBuild.cmake | 3 ++- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 646d52eb..3c18a9a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -69,12 +69,6 @@ if (ADDITIONAL_PATHS) set(CMAKE_PREFIX_PATH ${ADDITIONAL_PATHS}) endif (ADDITIONAL_PATHS) -####################################################################### -# install dir -if(NOT INSTALL_DIR) - set(INSTALL_DIR "/opt/netgen" CACHE PATH "Prefix prepended to install directories") -endif(NOT INSTALL_DIR) - if(APPLE) set(CMAKE_INSTALL_PREFIX "${INSTALL_DIR}/Netgen.app/Contents/Resources" CACHE INTERNAL "Prefix prepended to install directories" FORCE) else(APPLE) diff --git a/cmake_modules/SuperBuild.cmake b/cmake_modules/SuperBuild.cmake index ee39bc00..eb800779 100644 --- a/cmake_modules/SuperBuild.cmake +++ b/cmake_modules/SuperBuild.cmake @@ -45,10 +45,11 @@ endif(WIN32) ####################################################################### # find netgen -set(INSTALL_DIR /opt/netgen CACHE PATH "Install path") if(APPLE) + set(INSTALL_DIR /Applications CACHE PATH "Install path") set(CMAKE_INSTALL_PREFIX "${INSTALL_DIR}/Netgen.app/Contents/Resources" CACHE INTERNAL "Prefix prepended to install directories" FORCE) else(APPLE) + set(INSTALL_DIR /opt/netgen CACHE PATH "Install path") set(CMAKE_INSTALL_PREFIX "${INSTALL_DIR}" CACHE INTERNAL "Prefix prepended to install directories" FORCE) endif(APPLE) if(UNIX)