From ada2e0b08c5a7dac40c7a27e09feb4b3e86980ad Mon Sep 17 00:00:00 2001 From: kevin Heifner Date: Thu, 18 Sep 2025 12:38:56 -0500 Subject: [PATCH 1/4] Revert back to only setting OPENSSL_ROOT, not requiring it --- CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c858ad8..67b4ded 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,11 +54,7 @@ if(APPLE) message(FATAL_ERROR "OpenSSL not found. Please install OpenSSL via Homebrew.") endif() elseif(UNIX) - if(IS_DIRECTORY "/usr/include/openssl") - set(OPENSSL_ROOT "/usr/include/openssl") - else() - message(FATAL_ERROR "OpenSSL not found. Please install OpenSSL via Homebrew.") - endif() + set(OPENSSL_ROOT "/usr/include/openssl") endif() # NOT USED CURRENTLY From 46eafaed21a2411c10c807a0151a6c420bda3372 Mon Sep 17 00:00:00 2001 From: Jonathan Glanz Date: Sun, 28 Sep 2025 18:53:50 -0400 Subject: [PATCH 2/4] Formatting and misc file cleanup --- .gitignore | 7 + .idea/.gitignore | 8 - .idea/.name | 1 - .idea/codeStyles/Project.xml | 105 -------- .idea/codeStyles/codeStyleConfig.xml | 5 - .idea/editor.xml | 343 --------------------------- .idea/misc.xml | 7 - .idea/modules.xml | 8 - .idea/vcs.xml | 7 - .idea/wire-system-contracts.iml | 2 - build.sh | 17 +- 11 files changed, 18 insertions(+), 492 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/.name delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/codeStyles/codeStyleConfig.xml delete mode 100644 .idea/editor.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/wire-system-contracts.iml diff --git a/.gitignore b/.gitignore index e5464ee..ebe4257 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +.idea +.vscode +*ctags + # Prerequisites *.d @@ -37,3 +41,6 @@ cmake-build-*/* .vscode tmp/ +.idea/editor.xml +.idea/misc.xml +.idea/inspectionProfiles/Project_Default.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 5eee8b1..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -wire_system_contracts \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 81469bd..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 79ee123..0000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/editor.xml b/.idea/editor.xml deleted file mode 100644 index effc9fb..0000000 --- a/.idea/editor.xml +++ /dev/null @@ -1,343 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 0b76fe5..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index f1cdc1b..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 8306744..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/wire-system-contracts.iml b/.idea/wire-system-contracts.iml deleted file mode 100644 index f08604b..0000000 --- a/.idea/wire-system-contracts.iml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/build.sh b/build.sh index f2a1669..f2dba50 100755 --- a/build.sh +++ b/build.sh @@ -76,9 +76,14 @@ fi printf "\t=========== Building wire-system-contracts ===========\n\n" RED='\033[0;31m' NC='\033[0m' -CPU_CORES=$(getconf _NPROCESSORS_ONLN) -mkdir -p build -pushd build &> /dev/null -cmake -DBUILD_TESTS=${BUILD_TESTS} ${SYSIO_DIR_CMAKE_OPTION} ${CDT_DIR_CMAKE_OPTION} ../ -make -j $CPU_CORES -popd &> /dev/null +CPU_CORES=$(nproc) +mkdir -p build/release + +cmake -S . -B build/release \ + -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_TESTS=${BUILD_TESTS} \ + ${SYSIO_DIR_CMAKE_OPTION} \ + ${CDT_DIR_CMAKE_OPTION} + +CMAKE_BUILD_PARALLEL_LEVEL=${CPU_CORES} cmake --build build/release + From 97821812eea614dbb205fe88943b124c112f08b5 Mon Sep 17 00:00:00 2001 From: Jonathan Glanz Date: Tue, 30 Sep 2025 10:50:24 -0400 Subject: [PATCH 3/4] Forced clang-18 as compiler --- build.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index f2dba50..5cf4fb5 100755 --- a/build.sh +++ b/build.sh @@ -77,13 +77,17 @@ printf "\t=========== Building wire-system-contracts ===========\n\n" RED='\033[0;31m' NC='\033[0m' CPU_CORES=$(nproc) +rm -rf build/release mkdir -p build/release cmake -S . -B build/release \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTS=${BUILD_TESTS} \ ${SYSIO_DIR_CMAKE_OPTION} \ - ${CDT_DIR_CMAKE_OPTION} + ${CDT_DIR_CMAKE_OPTION} \ + -DCMAKE_C_COMPILER=/usr/bin/clang-18 \ + -DCMAKE_CXX_COMPILER=/usr/bin/clang++-18 + CMAKE_BUILD_PARALLEL_LEVEL=${CPU_CORES} cmake --build build/release From d0da073c0b2fef92f59fa2aef1fb4535caa4aef0 Mon Sep 17 00:00:00 2001 From: Jonathan Glanz Date: Tue, 30 Sep 2025 10:50:24 -0400 Subject: [PATCH 4/4] Forced clang-18 as compiler --- build.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index f2dba50..5cf4fb5 100755 --- a/build.sh +++ b/build.sh @@ -77,13 +77,17 @@ printf "\t=========== Building wire-system-contracts ===========\n\n" RED='\033[0;31m' NC='\033[0m' CPU_CORES=$(nproc) +rm -rf build/release mkdir -p build/release cmake -S . -B build/release \ -DCMAKE_BUILD_TYPE=Release \ -DBUILD_TESTS=${BUILD_TESTS} \ ${SYSIO_DIR_CMAKE_OPTION} \ - ${CDT_DIR_CMAKE_OPTION} + ${CDT_DIR_CMAKE_OPTION} \ + -DCMAKE_C_COMPILER=/usr/bin/clang-18 \ + -DCMAKE_CXX_COMPILER=/usr/bin/clang++-18 + CMAKE_BUILD_PARALLEL_LEVEL=${CPU_CORES} cmake --build build/release