major internal update - removed macOS dependency on gcc

radj307 · Mar 4, 2024 · c1bd44f · c1bd44f
1 parent 9062329
commit c1bd44f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/.github/workflows/MakeRelease.yaml b/.github/workflows/MakeRelease.yaml
@@ -26,7 +26,7 @@ jobs:
       run:  cmake --build build --config Release
 
     - name: Create Archive
-      run:  Compress-Archive build/ARRCON/*.exe ARRCON-$(.\ARRCON -vq)-Windows.zip
+      run:  Compress-Archive build/ARRCON/ARRCON.exe ARRCON-$(.\ARRCON -vq)-Windows.zip
       shell: pwsh
 
     - name: Upload Artifact
@@ -60,7 +60,7 @@ jobs:
     - name: Create Archive
       run: |
         cd build/ARRCON
-        zip -T9 ARRCON-$(./ARRCON -vq)-Linux.zip *.exe
+        zip -T9 ARRCON-$(./ARRCON -vq)-Linux.zip ARRCON
         mv *.zip ../..
 
     - name: Upload Artifact
@@ -94,7 +94,7 @@ jobs:
     - name: Create Archive
       run: |
         cd build/ARRCON
-        zip -T9 ARRCON-$(./ARRCON -vq)-MacOS.zip *.exe
+        zip -T9 ARRCON-$(./ARRCON -vq)-MacOS.zip ARRCON
         mv *.zip ../..
 
     - name: Upload Artifact

diff --git a/ARRCON/ARRCON.cpp b/ARRCON/ARRCON.cpp
@@ -14,6 +14,7 @@
 #include <color-sync.hpp>			//< for color::sync
 #include <envpath.hpp>				//< for env::PATH
 #include <hasPendingDataSTDIN.h>	//< for hasPendingDataSTDIN
+#include <str/strconv.hpp>
 
 // STL
 #include <filesystem>	//< for std::filesystem

diff --git a/ARRCON/CMakeLists.txt b/ARRCON/CMakeLists.txt
@@ -41,6 +41,8 @@ file(GLOB RESOURCES
 	"${CMAKE_CURRENT_BINARY_DIR}/rc/*"
 )
 
+include_directories("/opt/local/include")
+
 add_executable(ARRCON "${SRCS}" "${RESOURCES}")
 
 set_property(TARGET ARRCON PROPERTY CXX_STANDARD 20)
@@ -59,6 +61,8 @@ target_sources(ARRCON PRIVATE "${HEADERS}")
 find_package(Boost 1.84.0 COMPONENTS asio)
 # Fallback to FetchContent if not found
 if (NOT Boost_FOUND)
+	message(STATUS "Downloading Boost 1.84.0 via FetchContent")
+
 	include(FetchContent)
 	FetchContent_Declare(
 		Boost

diff --git a/ARRCON/net/rcon.hpp b/ARRCON/net/rcon.hpp
@@ -314,7 +314,11 @@ namespace net {
 			 */
 			void set_timeout(int timeout_ms)
 			{
-				socket.set_option(boost::asio::detail::socket_option::integer<SOL_SOCKET, SO_RCVTIMEO>{ timeout_ms });
+				try {
+					socket.set_option(boost::asio::detail::socket_option::integer<SOL_SOCKET, SO_RCVTIMEO>{ timeout_ms });
+				} catch (std::exception const& ex) {
+					std::clog << MessageHeader(LogLevel::Error) << "Failed to set socket timeout due to exception: \"" << ex.what() << '\"' << std::endl;
+				}
 			}
 
 			/**

diff --git a/CMakePresets.json b/CMakePresets.json
@@ -12,9 +12,6 @@
       "hidden": true,
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/out/build/${presetName}",
-      "cacheVariables": {
-        "CMAKE_INSTALL_PREFIX": "${sourceDir}/out/install/${presetName}"
-      },
       "warnings": {
         "deprecated": true,
         "unusedCli": true,
@@ -78,6 +75,12 @@
       "name": "macos-default",
       "inherits": "base",
       "hidden": true,
+      "cacheVariables": {
+        "CMAKE_C_COMPILER": "/opt/local/bin/clang-mp-17",
+        "CMAKE_CXX_COMPILER": "/opt/local/bin/clang++-mp-17",
+        // This requires the full path to ninja because visual studio doesn't find it on the PATH when cross compiling:
+        "CMAKE_MAKE_PROGRAM": "/usr/local/bin/ninja"
+      },
       "vendor": {
         "microsoft.com/VisualStudioSettings/CMake/1.0": { "hostOS": [ "macOS" ] },
         "microsoft.com/VisualStudioRemoteSettings/CMake/1.0": { "sourceDir": "$env{HOME}/.vs/$ms{projectDirName}" }