From 282a76abf721049cf5617d0a5e02d78dcb6bcd01 Mon Sep 17 00:00:00 2001 From: Michael Sharp <51342856+michaelgsharp@users.noreply.github.com> Date: Fri, 11 Apr 2025 12:29:38 -0600 Subject: [PATCH 1/8] update cmake mac --- build/ci/job-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml index 6d0f8f3bd6..93ef828a26 100644 --- a/build/ci/job-template.yml +++ b/build/ci/job-template.yml @@ -67,7 +67,7 @@ jobs: steps: # Extra MacOS step required to install OS-specific dependencies - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), not(contains(parameters.name, 'cross'))) }}: - - script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula + - script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && brew install cmake && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula displayName: Install MacOS build dependencies # Extra Apple MacOS step required to install OS-specific dependencies - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}: From 1c016d68dabe6d633f3576b262166048f2a600db Mon Sep 17 00:00:00 2001 From: Michael Sharp <51342856+michaelgsharp@users.noreply.github.com> Date: Mon, 14 Apr 2025 10:54:42 -0600 Subject: [PATCH 2/8] cmake specific version --- build/ci/job-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml index 93ef828a26..1af67b8c34 100644 --- a/build/ci/job-template.yml +++ b/build/ci/job-template.yml @@ -67,7 +67,7 @@ jobs: steps: # Extra MacOS step required to install OS-specific dependencies - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), not(contains(parameters.name, 'cross'))) }}: - - script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && brew install cmake && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula + - script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && brew install cmake@3.5 && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula displayName: Install MacOS build dependencies # Extra Apple MacOS step required to install OS-specific dependencies - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}: From ba8becb84d27f8c25d885d2220f0f625130f2003 Mon Sep 17 00:00:00 2001 From: Michael Sharp <51342856+michaelgsharp@users.noreply.github.com> Date: Mon, 14 Apr 2025 11:25:51 -0600 Subject: [PATCH 3/8] remove specific version --- build/ci/job-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml index 1af67b8c34..93ef828a26 100644 --- a/build/ci/job-template.yml +++ b/build/ci/job-template.yml @@ -67,7 +67,7 @@ jobs: steps: # Extra MacOS step required to install OS-specific dependencies - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), not(contains(parameters.name, 'cross'))) }}: - - script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && brew install cmake@3.5 && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula + - script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && brew install cmake && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula displayName: Install MacOS build dependencies # Extra Apple MacOS step required to install OS-specific dependencies - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}: From 3cf28911f0d34228b114ae197320c0ac5fadc21f Mon Sep 17 00:00:00 2001 From: Michael Sharp <51342856+michaelgsharp@users.noreply.github.com> Date: Mon, 21 Apr 2025 11:03:17 -0600 Subject: [PATCH 4/8] cmake policy version minimum --- build/ci/job-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml index 93ef828a26..b942fd5583 100644 --- a/build/ci/job-template.yml +++ b/build/ci/job-template.yml @@ -67,7 +67,7 @@ jobs: steps: # Extra MacOS step required to install OS-specific dependencies - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), not(contains(parameters.name, 'cross'))) }}: - - script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && brew install cmake && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula + - script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && CMAKE_POLICY_VERSION_MINIMUM=3.5 && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula displayName: Install MacOS build dependencies # Extra Apple MacOS step required to install OS-specific dependencies - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}: From c3370dede1cda33c1538432aad1db6100c655922 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Mon, 21 Apr 2025 12:18:29 -0700 Subject: [PATCH 5/8] Update build/ci/job-template.yml --- build/ci/job-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml index b942fd5583..e94d1feccb 100644 --- a/build/ci/job-template.yml +++ b/build/ci/job-template.yml @@ -67,7 +67,7 @@ jobs: steps: # Extra MacOS step required to install OS-specific dependencies - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), not(contains(parameters.name, 'cross'))) }}: - - script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && CMAKE_POLICY_VERSION_MINIMUM=3.5 && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula + - script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && export CMAKE_POLICY_VERSION_MINIMUM=3.5 && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula displayName: Install MacOS build dependencies # Extra Apple MacOS step required to install OS-specific dependencies - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}: From c5334317cd0e521a868aa84f73f5b61e2c0846ed Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Mon, 21 Apr 2025 12:23:55 -0700 Subject: [PATCH 6/8] Try adding -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to libomp.rb --- build/libomp.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/libomp.rb b/build/libomp.rb index 4557f89e20..cb944bf4f5 100644 --- a/build/libomp.rb +++ b/build/libomp.rb @@ -17,9 +17,9 @@ class Libomp < Formula depends_on "cmake" => :build def install - system "cmake", ".", *std_cmake_args + system "cmake", ".", "-DCMAKE_POLICY_VERSION_MINIMUM=3.5", *std_cmake_args system "make", "install" - system "cmake", ".", "-DLIBOMP_ENABLE_SHARED=OFF", *std_cmake_args + system "cmake", ".", "-DLIBOMP_ENABLE_SHARED=OFF", "-DCMAKE_POLICY_VERSION_MINIMUM=3.5", *std_cmake_args system "make", "install" end From dff86d48a70abecd8c0f762bdf67f1e6697df3fc Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Mon, 21 Apr 2025 12:28:00 -0700 Subject: [PATCH 7/8] Update job-template.yml --- build/ci/job-template.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/ci/job-template.yml b/build/ci/job-template.yml index e94d1feccb..6d0f8f3bd6 100644 --- a/build/ci/job-template.yml +++ b/build/ci/job-template.yml @@ -67,7 +67,7 @@ jobs: steps: # Extra MacOS step required to install OS-specific dependencies - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), not(contains(parameters.name, 'cross'))) }}: - - script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && export CMAKE_POLICY_VERSION_MINIMUM=3.5 && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula + - script: export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=TRUE && brew install $(Build.SourcesDirectory)/build/libomp.rb --build-from-source --formula displayName: Install MacOS build dependencies # Extra Apple MacOS step required to install OS-specific dependencies - ${{ if and(contains(parameters.pool.vmImage, 'macOS'), contains(parameters.name, 'cross')) }}: From c3e89ea4248426482b856a811ff6b72ecd5ae7a0 Mon Sep 17 00:00:00 2001 From: Eric StJohn Date: Wed, 23 Apr 2025 08:04:44 -0700 Subject: [PATCH 8/8] Update cmake_minimum_required --- src/Native/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Native/CMakeLists.txt b/src/Native/CMakeLists.txt index 605fe6f700..50e94feef6 100644 --- a/src/Native/CMakeLists.txt +++ b/src/Native/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.12) +cmake_minimum_required(VERSION 3.20) project(Native)