Removing mac os from specific supported OSes and modifyng paraview script to work on mac os

Author: johnpapad24

cmake/external/ParaView.cmake

@@ -9,7 +9,9 @@ endif()
 
 if(EXISTS "${CMAKE_SOURCE_DIR}/third_party/paraview")
 			file(COPY "${CMAKE_SOURCE_DIR}/third_party/paraview" DESTINATION "${CMAKE_SOURCE_DIR}/build/third_party")
-			#set(CMAKE_BDM_PVVERSION "5.11")
+			if(APPLE)
+				set(CMAKE_BDM_PVVERSION "5.9")
+			endif()
 
 else()
 	execute_process(COMMAND bash ${PARAVIEW_BLD_SCRIPT_LOCATION}/build-paraview_new.sh ${CMAKE_SOURCE_DIR} RESULT_VARIABLE PARAVIEW_DOWNLOAD_OR_BUILD)
@@ -42,7 +44,9 @@ else()
 			file(MAKE_DIRECTORY "${CMAKE_SOURCE_DIR}/build/third_party")
 		endif()
 			file(COPY "${CMAKE_SOURCE_DIR}/third_party/paraview" DESTINATION "${CMAKE_SOURCE_DIR}/build/third_party")
-			#set(CMAKE_BDM_PVVERSION "5.11")
+			if(APPLE)
+				set(CMAKE_BDM_PVVERSION "5.9")
+			endif()
 
 	endif()
 endif()

util/build-third-party/build-paraview_new.sh

@@ -41,7 +41,7 @@ PYTH=""
 BDM_OS=$(DetectOs2)
 
 
-if [ $BDM_OS = "osx" ]; then
+if [ $BDM_OS == "osx" ]; then
 
   if [ $brewpy == "yes" ]; then
   	 	 PYTH="$(brew --prefix)/bin/python${PYV2}"
@@ -68,7 +68,15 @@ mkdir -p $PARAVIEW_INSTALL_DIR
 mkdir -p $PARAVIEW_INSTALL_DIR/catalyst
 tar -xvzf $CATALYST_TGZ_FILE -C $DEST_DIR/catalyst --strip-components=1
 tar -Jxvf $PARAVIEW_TXZ_FILE -C $DEST_DIR --strip-components=1
-export Qt5_DIR=$BDM_PROJECT_DIR/build/third_party/qt
+if [ $BDM_OS == "osx" ]; then
+	if [ -d $BDM_PROJECT_DIR/build/third_party/qt ]
+		export Qt5_DIR=$BDM_PROJECT_DIR/build/third_party/qt
+	else
+		export Qt5_DIR=$(brew --prefix qt5)/lib/cmake/Qt5
+	fi
+else 
+	export Qt5_DIR=$BDM_PROJECT_DIR/build/third_party/qt
+fi
 cd $DEST_DIR/catalyst
 mkdir obj
 cd obj

util/installation/common/util.sh

@@ -17,7 +17,7 @@
 # (Thus reducing code duplication)
 
 SCRIPTPATH="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-SPECIFIC_OSES_SUPPORTED="ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, centos-7 osx"
+SPECIFIC_OSES_SUPPORTED="ubuntu-18.04, ubuntu-20.04, ubuntu-22.04, centos-7"
 
 #include echo.sh
 . $SCRIPTPATH/echo.sh