consistently use COVISE_ARCHSUFFIX

don't mix ARCHSUFFIX and COVISE_ARCHSUFFIX

cmake/CovisePresets.cmake

@@ -7,8 +7,10 @@
 # for the lazy ones who do not want to type the same thing in else(), endif() and so on
 SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS TRUE)
 
-if ("${ARCHSUFFIX}" MATCHES "^spack")
+if ("${COVISE_ARCHSUFFIX}" MATCHES "^spack")
     set(COVISE_INSTALL_LIBDIR lib)
+    set(CMAKE_SKIP_RPATH FALSE)
+    set(CMAKE_MACOSX_RPATH TRUE)
 else()
     set(COVISE_INSTALL_LIBDIR ${ARCHSUFFIX}/lib)
     # disable rpath - only rely on LD_LIBRARY_PATH and the likes

src/OpenCOVER/CMakeLists.txt

@@ -130,13 +130,12 @@ IF(CURL_FOUND)
 ENDIF()
 
 if(NOT COVISE_OPENCOVER_INTERNAL_PROJECT)
-    set(ARCHSUFFIX "${COVISE_ARCHSUFFIX}")
-    string(TOLOWER "${ARCHSUFFIX}" ARCHSUFFIX)
-    string(REGEX REPLACE "opt$" "" BASEARCHSUFFIX "${ARCHSUFFIX}")
+    string(TOLOWER "${COVISE_ARCHSUFFIX}" COVISE_ARCHSUFFIX)
+    string(REGEX REPLACE "opt$" "" BASEARCHSUFFIX "${COVISE_ARCHSUFFIX}")
     set(DBG_ARCHSUFFIX "${BASEARCHSUFFIX}")
     string(REGEX REPLACE "xenomai$" "" BASEARCHSUFFIX "${BASEARCHSUFFIX}")
     string(REGEX REPLACE "mpi$" "" BASEARCHSUFFIX "${BASEARCHSUFFIX}")
-    if(ARCHSUFFIX STREQUAL DBG_ARCHSUFFIX)
+    if(COVISE_ARCHSUFFIX STREQUAL DBG_ARCHSUFFIX)
         set(CMAKE_BUILD_TYPE "Debug")
     else()
         set(CMAKE_BUILD_TYPE "RelWithDebInfo")
@@ -163,7 +162,7 @@ endif()
 
 if(NOT COVISE_OPENCOVER_INTERNAL_PROJECT)
     IF(COVISE_EXPORT_TO_INSTALL)
-        set(COVISE_EXPORTS_PATH "${COVISEDIR}/${ARCHSUFFIX}")
+        set(COVISE_EXPORTS_PATH "${COVISEDIR}/${COVISE_ARCHSUFFIX}")
     ELSE()
         set(COVISE_EXPORTS_PATH "${CMAKE_BINARY_DIR}")
     ENDIF()
@@ -227,13 +226,13 @@ INSTALL(FILES "../../cmake/FindCOVER.cmake" DESTINATION
 # bundle.depends = opencoverapp
 
 # opencoverapp.depends = main plugins always_out_of_date
-# opencoverapp.target = $$COVISEDIR/$$ARCHSUFFIX/Applications/OpenCOVER.app
+# opencoverapp.target = $$COVISEDIR/$$COVISE_ARCHSUFFIX/Applications/OpenCOVER.app
 # opencoverapp.commands = $(RM) -r "$@" \
-    # && mkdir -p $$COVISEDIR/$$ARCHSUFFIX/Applications \
+# && mkdir -p $$COVISEDIR/$$COVISE_ARCHSUFFIX/Applications \
     # && cp -HR $$BINDESTDIR/Renderer/OpenCOVER.app "$@" \
     # && mkdir -p "$@"/Contents/Resources \
     # && cp -HR $$COVISEDIR/share/covise/icons $$COVISEDIR/share/covise/fonts $$COVISEDIR/config "$@"/Contents/Resources \
     # && mkdir -p "$@"/Contents/PlugIns \
     # && cp -HR ${OPENSCENEGRAPH_LIBPATH}/osgPlugins-2.9.7/* "$@"/Contents/PlugIns/ \
-    # && cp -HR $$COVISEDIR/$$ARCHSUFFIX/lib/OpenCOVER/plugins/* "$@"/Contents/PlugIns/ \
+    # && cp -HR $$COVISEDIR/$$COVISE_ARCHSUFFIX/lib/OpenCOVER/plugins/* "$@"/Contents/PlugIns/ \
     # && ${COVISEDIR}/../common/mkspecs/makebundle.sh "$@"

src/OpenCOVER/plugins/general/Rift/CMakeLists.txt

@@ -14,5 +14,5 @@ SET(SOURCES
   oculusdevice.cpp
 )
 
-cover_add_plugin(Rift optimized ${COVISE_DESTDIR}/${ARCHSUFFIX}/lib/OpenCOVER/plugins/input_rift  debug ${COVISE_DESTDIR}/${DBG_ARCHSUFFIX}/lib/OpenCOVER/plugins/input_rift)
+cover_add_plugin(Rift optimized ${COVISE_DESTDIR}/${COVISE_ARCHSUFFIX}/lib/OpenCOVER/plugins/input_rift  debug ${COVISE_DESTDIR}/${DBG_ARCHSUFFIX}/lib/OpenCOVER/plugins/input_rift)
 

src/OpenCOVER/plugins/hlrs/Revit/RevitPlugin/OpenCOVERPlugin/CMakeLists.txt

@@ -44,9 +44,9 @@ IF(CMAKE_CONFIGURATION_TYPES)
     ELSE(CMAKE_CONFIGURATION_TYPES)
       # no configuration types - probably makefile generator
       STRING(TOUPPER "${CMAKE_BUILD_TYPE}" upper_build_type_str)
-      SET_TARGET_PROPERTIES(OpenCOVERPlugin PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_${upper_build_type_str} "${COVISE_DESTDIR}/${ARCHSUFFIX}/${BINLIB_SUFFIX}${MYPATH_POSTFIX}")
-      SET_TARGET_PROPERTIES(OpenCOVERPlugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY_${upper_build_type_str} "${COVISE_DESTDIR}/${ARCHSUFFIX}/${BINLIB_SUFFIX}${MYPATH_POSTFIX}")
-      SET_TARGET_PROPERTIES(OpenCOVERPlugin PROPERTIES RUNTIME_OUTPUT_DIRECTORY_${upper_build_type_str} "${COVISE_DESTDIR}/${ARCHSUFFIX}/${BINLIB_SUFFIX}${MYPATH_POSTFIX}")
+      SET_TARGET_PROPERTIES(OpenCOVERPlugin PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_${upper_build_type_str} "${COVISE_DESTDIR}/${COVISE_ARCHSUFFIX}/${BINLIB_SUFFIX}${MYPATH_POSTFIX}")
+      SET_TARGET_PROPERTIES(OpenCOVERPlugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY_${upper_build_type_str} "${COVISE_DESTDIR}/${COVISE_ARCHSUFFIX}/${BINLIB_SUFFIX}${MYPATH_POSTFIX}")
+      SET_TARGET_PROPERTIES(OpenCOVERPlugin PROPERTIES RUNTIME_OUTPUT_DIRECTORY_${upper_build_type_str} "${COVISE_DESTDIR}/${COVISE_ARCHSUFFIX}/${BINLIB_SUFFIX}${MYPATH_POSTFIX}")
     ENDIF(CMAKE_CONFIGURATION_TYPES)
 
 csharp_set_designer_cs_properties(
@@ -71,4 +71,4 @@ set_property(TARGET OpenCOVERPlugin PROPERTY VS_DOTNET_REFERENCES
     "System.Windows.Presentation"
     "System.Xaml"
     "System.Xml"
-    "WindowsBase")
+    "WindowsBase")

src/kernel/util/CMakeLists.txt

@@ -19,7 +19,7 @@ IF(WIN32)
   set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DARCHSUFFIX=\\\"${BASEARCHSUFFIX}opt\\\"")
   set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DARCHSUFFIX=\\\"${BASEARCHSUFFIX}\\\"")
 ELSE(WIN32)
-  ADD_DEFINITIONS(-DARCHSUFFIX="${ARCHSUFFIX}")
+    ADD_DEFINITIONS(-DARCHSUFFIX="${COVISE_ARCHSUFFIX}")
 ENDIF(WIN32)
 
 IF(APPLE)

src/sys/wsinterface/CMakeLists.txt

@@ -17,7 +17,7 @@ QT_ADD_RESOURCES(WSI_RESOURCE_FILES "../../../share/covise/web/web.qrc" OPTIONS
 INCLUDE_DIRECTORIES(
   ${GSOAP_INCLUDE_DIR}
   "${COVISEDIR}/src/kernel/wslib"
-  "${COVISEDIR}/${ARCHSUFFIX}/include"
+  "${COVISEDIR}/${COVISE_ARCHSUFFIX}/include"
   "${CMAKE_BINARY_DIR}/src/kernel/wslib"
 )
 

src/tools/Revit/OpenFOAM/CMakeLists.txt

@@ -88,9 +88,9 @@ IF(CMAKE_CONFIGURATION_TYPES)
 ELSE(CMAKE_CONFIGURATION_TYPES)
   # no configuration types - probably makefile generator
   STRING(TOUPPER "${CMAKE_BUILD_TYPE}" upper_build_type_str)
-  SET_TARGET_PROPERTIES(OpenFOAMInterface PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_${upper_build_type_str} "${COVISE_DESTDIR}/${ARCHSUFFIX}/${BINLIB_SUFFIX}${MYPATH_POSTFIX}")
-  SET_TARGET_PROPERTIES(OpenFOAMInterface PROPERTIES LIBRARY_OUTPUT_DIRECTORY_${upper_build_type_str} "${COVISE_DESTDIR}/${ARCHSUFFIX}/${BINLIB_SUFFIX}${MYPATH_POSTFIX}")
-  SET_TARGET_PROPERTIES(OpenFOAMInterface PROPERTIES RUNTIME_OUTPUT_DIRECTORY_${upper_build_type_str} "${COVISE_DESTDIR}/${ARCHSUFFIX}/${BINLIB_SUFFIX}${MYPATH_POSTFIX}")
+  SET_TARGET_PROPERTIES(OpenFOAMInterface PROPERTIES ARCHIVE_OUTPUT_DIRECTORY_${upper_build_type_str} "${COVISE_DESTDIR}/${COVISE_ARCHSUFFIX}/${BINLIB_SUFFIX}${MYPATH_POSTFIX}")
+  SET_TARGET_PROPERTIES(OpenFOAMInterface PROPERTIES LIBRARY_OUTPUT_DIRECTORY_${upper_build_type_str} "${COVISE_DESTDIR}/${COVISE_ARCHSUFFIX}/${BINLIB_SUFFIX}${MYPATH_POSTFIX}")
+  SET_TARGET_PROPERTIES(OpenFOAMInterface PROPERTIES RUNTIME_OUTPUT_DIRECTORY_${upper_build_type_str} "${COVISE_DESTDIR}/${COVISE_ARCHSUFFIX}/${BINLIB_SUFFIX}${MYPATH_POSTFIX}")
 ENDIF(CMAKE_CONFIGURATION_TYPES)
 
 csharp_set_designer_cs_properties(
@@ -118,4 +118,4 @@ set_property(TARGET OpenFOAMInterface PROPERTY VS_DOTNET_REFERENCES
   "System.Drawing"
   "System.Windows.Forms"
   "WindowsBase"
-)
+)