From 5bb0027be48713e72490a7a4c5cdbf435aa70d95 Mon Sep 17 00:00:00 2001 From: sevendev Date: Wed, 24 Sep 2025 12:35:51 +0900 Subject: [PATCH 01/24] =?UTF-8?q?u8string=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/c_wrapper/vector_tile_downloader_c.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/c_wrapper/vector_tile_downloader_c.cpp b/src/c_wrapper/vector_tile_downloader_c.cpp index 99989fee..2460d523 100644 --- a/src/c_wrapper/vector_tile_downloader_c.cpp +++ b/src/c_wrapper/vector_tile_downloader_c.cpp @@ -42,7 +42,7 @@ using namespace plateau::geometry; DLL_STRING_VALUE_FUNC(plateau_vector_tile_downloader_calc_destination_path, VectorTileDownloader, - handle->calcDestinationPath(index).string(), , int index) + handle->calcDestinationPath(index).u8string(), , int index) DLL_VALUE_FUNC(plateau_vector_tile_downloader_get_tile, VectorTileDownloader, From d7a1c70fe83bafd24973c95a7331cc96f8ac8e70 Mon Sep 17 00:00:00 2001 From: sevendev Date: Thu, 25 Sep 2025 11:14:11 +0900 Subject: [PATCH 02/24] libcitygml cmakelist version update --- 3rdparty/libcitygml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/libcitygml b/3rdparty/libcitygml index 90a72d9d..192e888d 160000 --- a/3rdparty/libcitygml +++ b/3rdparty/libcitygml @@ -1 +1 @@ -Subproject commit 90a72d9d31bd6e33dec457ebcb6346a630b76e50 +Subproject commit 192e888d4ba4e23f605ca5aac61b3f0ee1c172c6 From 1bfdb934cde7348a1f22899404af79b2cea273a3 Mon Sep 17 00:00:00 2001 From: sevendev Date: Thu, 25 Sep 2025 11:22:34 +0900 Subject: [PATCH 03/24] revert citygml cmakelist version --- 3rdparty/libcitygml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/libcitygml b/3rdparty/libcitygml index 192e888d..90a72d9d 160000 --- a/3rdparty/libcitygml +++ b/3rdparty/libcitygml @@ -1 +1 @@ -Subproject commit 192e888d4ba4e23f605ca5aac61b3f0ee1c172c6 +Subproject commit 90a72d9d31bd6e33dec457ebcb6346a630b76e50 From bb35f531e9d67cd761899783c5c4b723e6518932 Mon Sep 17 00:00:00 2001 From: sevendev Date: Thu, 25 Sep 2025 11:50:26 +0900 Subject: [PATCH 04/24] libcity gml cmakelist version update 2nd try --- 3rdparty/libcitygml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/libcitygml b/3rdparty/libcitygml index 90a72d9d..64c7b53d 160000 --- a/3rdparty/libcitygml +++ b/3rdparty/libcitygml @@ -1 +1 @@ -Subproject commit 90a72d9d31bd6e33dec457ebcb6346a630b76e50 +Subproject commit 64c7b53da80a021c6705da894988066846ff8ea3 From 71915c3a7ed7e50dee3b5932c6254969183e1f1d Mon Sep 17 00:00:00 2001 From: sevendev Date: Thu, 25 Sep 2025 12:34:11 +0900 Subject: [PATCH 05/24] =?UTF-8?q?=E8=A9=A6=E3=81=97=E3=81=ABrevert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 3rdparty/libcitygml | 2 +- src/c_wrapper/vector_tile_downloader_c.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/3rdparty/libcitygml b/3rdparty/libcitygml index 64c7b53d..90a72d9d 160000 --- a/3rdparty/libcitygml +++ b/3rdparty/libcitygml @@ -1 +1 @@ -Subproject commit 64c7b53da80a021c6705da894988066846ff8ea3 +Subproject commit 90a72d9d31bd6e33dec457ebcb6346a630b76e50 diff --git a/src/c_wrapper/vector_tile_downloader_c.cpp b/src/c_wrapper/vector_tile_downloader_c.cpp index 2460d523..eaac1465 100644 --- a/src/c_wrapper/vector_tile_downloader_c.cpp +++ b/src/c_wrapper/vector_tile_downloader_c.cpp @@ -42,7 +42,8 @@ using namespace plateau::geometry; DLL_STRING_VALUE_FUNC(plateau_vector_tile_downloader_calc_destination_path, VectorTileDownloader, - handle->calcDestinationPath(index).u8string(), , int index) + //handle->calcDestinationPath(index).u8string(), , int index) + handle->calcDestinationPath(index).string(), , int index) DLL_VALUE_FUNC(plateau_vector_tile_downloader_get_tile, VectorTileDownloader, From 95e3fbe0f0e1acab8660fca935ab1f4953035b47 Mon Sep 17 00:00:00 2001 From: sevendev Date: Thu, 25 Sep 2025 12:48:54 +0900 Subject: [PATCH 06/24] =?UTF-8?q?=E3=82=BD=E3=83=BC=E3=82=B9=E3=81=AE?= =?UTF-8?q?=E3=81=BF=E5=BE=A9=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/c_wrapper/vector_tile_downloader_c.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/c_wrapper/vector_tile_downloader_c.cpp b/src/c_wrapper/vector_tile_downloader_c.cpp index eaac1465..2460d523 100644 --- a/src/c_wrapper/vector_tile_downloader_c.cpp +++ b/src/c_wrapper/vector_tile_downloader_c.cpp @@ -42,8 +42,7 @@ using namespace plateau::geometry; DLL_STRING_VALUE_FUNC(plateau_vector_tile_downloader_calc_destination_path, VectorTileDownloader, - //handle->calcDestinationPath(index).u8string(), , int index) - handle->calcDestinationPath(index).string(), , int index) + handle->calcDestinationPath(index).u8string(), , int index) DLL_VALUE_FUNC(plateau_vector_tile_downloader_get_tile, VectorTileDownloader, From b8911fbcb4dff8ef98a9383d0290a1bd75826fe6 Mon Sep 17 00:00:00 2001 From: sevendev Date: Thu, 25 Sep 2025 16:38:23 +0900 Subject: [PATCH 07/24] libcitygml version update test 3rd try --- 3rdparty/libcitygml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/libcitygml b/3rdparty/libcitygml index 90a72d9d..64c7b53d 160000 --- a/3rdparty/libcitygml +++ b/3rdparty/libcitygml @@ -1 +1 @@ -Subproject commit 90a72d9d31bd6e33dec457ebcb6346a630b76e50 +Subproject commit 64c7b53da80a021c6705da894988066846ff8ea3 From 1851c16dd912f1a898169d11610fc6cbc06ff816 Mon Sep 17 00:00:00 2001 From: sevendev Date: Thu, 25 Sep 2025 17:47:28 +0900 Subject: [PATCH 08/24] =?UTF-8?q?3rd=20party=E3=81=AE=E5=A4=89=E6=9B=B4rev?= =?UTF-8?q?ert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 3rdparty/libcitygml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/3rdparty/libcitygml b/3rdparty/libcitygml index 64c7b53d..90a72d9d 160000 --- a/3rdparty/libcitygml +++ b/3rdparty/libcitygml @@ -1 +1 @@ -Subproject commit 64c7b53da80a021c6705da894988066846ff8ea3 +Subproject commit 90a72d9d31bd6e33dec457ebcb6346a630b76e50 From a5c65878ff338042766a634fdab1a5e387391f0e Mon Sep 17 00:00:00 2001 From: sevendev Date: Thu, 25 Sep 2025 18:04:54 +0900 Subject: [PATCH 09/24] =?UTF-8?q?CMAKE=20Version=E3=82=92=E5=BC=B7?= =?UTF-8?q?=E5=88=B6=E7=9A=84=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/actions/build/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index a92e80ae..a7849955 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -100,6 +100,7 @@ runs: -D BUILD_LIB_TYPE=dynamic -D RUNTIME_LIB_TYPE=MT -D CMAKE_OSX_ARCHITECTURES:STRING="${{ inputs.arch }}" + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ${{ env.ADDITIONAL_CMAKE_OPTIONS }} shell: ${{ inputs.shell_type }} # 10万行超えの警告が出るので一時的な処置として警告を抑制しています。 From df25bcf25127674372d57be45b6a808c2603119d Mon Sep 17 00:00:00 2001 From: sevendev Date: Thu, 25 Sep 2025 18:14:31 +0900 Subject: [PATCH 10/24] =?UTF-8?q?CMake=E3=81=AE=E3=83=90=E3=83=BC=E3=82=B8?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=82=93=E5=BC=B7=E5=88=B6=E5=A4=89=E6=9B=B4?= =?UTF-8?q?=E3=80=802nd=20try?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/actions/build/action.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index a7849955..fb5bf3ed 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -89,6 +89,13 @@ runs: echo "ADDITIONAL_CMAKE_OPTIONS=-DCMAKE_CXX_COMPILER=cl.exe" >> $env:GITHUB_ENV shell: ${{ inputs.shell_type }} + # Macで使うコンパイラを明示 + - name: Setup Additional Cmake Options in Mac + if: runner.os != 'Windows' + run: | + echo "ADDITIONAL_CMAKE_OPTIONS=-DCMAKE_POLICY_VERSION_MINIMUM=3.5" >> $env:GITHUB_ENV + shell: ${{ inputs.shell_type }} + - name: Configure CMake for Unity run: > cmake @@ -100,7 +107,6 @@ runs: -D BUILD_LIB_TYPE=dynamic -D RUNTIME_LIB_TYPE=MT -D CMAKE_OSX_ARCHITECTURES:STRING="${{ inputs.arch }}" - -DCMAKE_POLICY_VERSION_MINIMUM=3.5 ${{ env.ADDITIONAL_CMAKE_OPTIONS }} shell: ${{ inputs.shell_type }} # 10万行超えの警告が出るので一時的な処置として警告を抑制しています。 From 55d7a2cbdc14147aa77ece619f273076ad390922 Mon Sep 17 00:00:00 2001 From: sevendev Date: Thu, 25 Sep 2025 18:26:11 +0900 Subject: [PATCH 11/24] =?UTF-8?q?cmake=20version=20=E5=BC=B7=E5=88=B6?= =?UTF-8?q?=E5=A4=89=E6=9B=B4=E3=80=803rd=20try?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/actions/build/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index fb5bf3ed..f82c62d2 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -90,7 +90,7 @@ runs: shell: ${{ inputs.shell_type }} # Macで使うコンパイラを明示 - - name: Setup Additional Cmake Options in Mac + - name: Setup Additional Cmake Options in non-Windows if: runner.os != 'Windows' run: | echo "ADDITIONAL_CMAKE_OPTIONS=-DCMAKE_POLICY_VERSION_MINIMUM=3.5" >> $env:GITHUB_ENV @@ -107,6 +107,7 @@ runs: -D BUILD_LIB_TYPE=dynamic -D RUNTIME_LIB_TYPE=MT -D CMAKE_OSX_ARCHITECTURES:STRING="${{ inputs.arch }}" + -D CMAKE_POLICY_VERSION=3.5 ${{ env.ADDITIONAL_CMAKE_OPTIONS }} shell: ${{ inputs.shell_type }} # 10万行超えの警告が出るので一時的な処置として警告を抑制しています。 From c7f1dd971a852b12a444135c263c88462fa661f6 Mon Sep 17 00:00:00 2001 From: sevendev Date: Thu, 25 Sep 2025 18:29:57 +0900 Subject: [PATCH 12/24] 4th try --- .github/actions/build/action.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index f82c62d2..9898bef2 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -93,7 +93,7 @@ runs: - name: Setup Additional Cmake Options in non-Windows if: runner.os != 'Windows' run: | - echo "ADDITIONAL_CMAKE_OPTIONS=-DCMAKE_POLICY_VERSION_MINIMUM=3.5" >> $env:GITHUB_ENV + echo "ADDITIONAL_CMAKE_OPTIONS=-DCMAKE_POLICY_VERSION_MINIMUM=3.5" >> $GITHUB_ENV shell: ${{ inputs.shell_type }} - name: Configure CMake for Unity @@ -107,7 +107,6 @@ runs: -D BUILD_LIB_TYPE=dynamic -D RUNTIME_LIB_TYPE=MT -D CMAKE_OSX_ARCHITECTURES:STRING="${{ inputs.arch }}" - -D CMAKE_POLICY_VERSION=3.5 ${{ env.ADDITIONAL_CMAKE_OPTIONS }} shell: ${{ inputs.shell_type }} # 10万行超えの警告が出るので一時的な処置として警告を抑制しています。 From 8f556ff57dd2d2a6842a669ee4ff919f4e2652ee Mon Sep 17 00:00:00 2001 From: sevendev Date: Thu, 25 Sep 2025 18:39:30 +0900 Subject: [PATCH 13/24] =?UTF-8?q?=E3=83=93=E3=83=AB=E3=83=89=E9=80=9A?= =?UTF-8?q?=E3=82=89=E3=81=AA=E3=81=84=E3=81=AE=E3=81=A7Revert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/actions/build/action.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 9898bef2..a92e80ae 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -89,13 +89,6 @@ runs: echo "ADDITIONAL_CMAKE_OPTIONS=-DCMAKE_CXX_COMPILER=cl.exe" >> $env:GITHUB_ENV shell: ${{ inputs.shell_type }} - # Macで使うコンパイラを明示 - - name: Setup Additional Cmake Options in non-Windows - if: runner.os != 'Windows' - run: | - echo "ADDITIONAL_CMAKE_OPTIONS=-DCMAKE_POLICY_VERSION_MINIMUM=3.5" >> $GITHUB_ENV - shell: ${{ inputs.shell_type }} - - name: Configure CMake for Unity run: > cmake From 05b9df7049e8fcef65f7e6a59b8ff88fdb452c74 Mon Sep 17 00:00:00 2001 From: sevendev Date: Thu, 25 Sep 2025 19:36:24 +0900 Subject: [PATCH 14/24] another try --- .github/actions/build/action.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index a92e80ae..941b8cdd 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -100,15 +100,22 @@ runs: -D BUILD_LIB_TYPE=dynamic -D RUNTIME_LIB_TYPE=MT -D CMAKE_OSX_ARCHITECTURES:STRING="${{ inputs.arch }}" + -D CMAKE_POLICY_VERSION_MINIMUM=3.5 ${{ env.ADDITIONAL_CMAKE_OPTIONS }} shell: ${{ inputs.shell_type }} # 10万行超えの警告が出るので一時的な処置として警告を抑制しています。 - - name: Build by CMake for Unity run: cmake --build ${{github.workspace}}/out/build/x64-Release-Unity --config ${{env.BUILD_TYPE}} shell: ${{ inputs.shell_type }} + - name: Patch libcitygml CMakeLists.txt + run: > + FILE="3rdparty/libcitygml/CMakeLists.txt" + if grep -q "cmake_minimum_required(VERSION 2.8)" "$FILE"; then + sed -i '' 's/CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0 FATAL_ERROR)/CMAKE_MINIMUM_REQUIRED(VERSION 3.5)/' "$FILE" + fi + - name: Configure CMake for Unreal for non-Windows if: runner.os != 'Windows' run: > From 15128affd453c8129fb81dfa8309c611481248ca Mon Sep 17 00:00:00 2001 From: sevendev Date: Thu, 25 Sep 2025 19:44:05 +0900 Subject: [PATCH 15/24] another try2 --- .github/actions/build/action.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 941b8cdd..3b481995 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -40,8 +40,6 @@ runs: run: sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev shell: ${{ inputs.shell_type }} - - # Unreal Engineと合わせたバージョンでMSVCを用意する準備として、始めからある望みでないバージョンを消します。 # 参考: https://github.com/actions/runner-images/issues/9701 - name: Delete components @@ -75,7 +73,13 @@ runs: $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden shell: ${{ inputs.shell_type }} - + - name: Patch libcitygml CMakeLists.txt + run: | + FILE="3rdparty/libcitygml/CMakeLists.txt" + if grep -q "cmake_minimum_required(VERSION 2.8)" "$FILE"; then + sed -i '' 's/cmake_minimum_required(VERSION 2.8)/cmake_minimum_required(VERSION 3.5)/' "$FILE" + fi + shell: ${{ inputs.shell_type }} # Windowsのみコンパイラパスを通します。 - name: Add msbuild to PATH @@ -109,13 +113,6 @@ runs: run: cmake --build ${{github.workspace}}/out/build/x64-Release-Unity --config ${{env.BUILD_TYPE}} shell: ${{ inputs.shell_type }} - - name: Patch libcitygml CMakeLists.txt - run: > - FILE="3rdparty/libcitygml/CMakeLists.txt" - if grep -q "cmake_minimum_required(VERSION 2.8)" "$FILE"; then - sed -i '' 's/CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0 FATAL_ERROR)/CMAKE_MINIMUM_REQUIRED(VERSION 3.5)/' "$FILE" - fi - - name: Configure CMake for Unreal for non-Windows if: runner.os != 'Windows' run: > From c36f3c8e84cafa365a6d2084e06d823e5dd4cfa6 Mon Sep 17 00:00:00 2001 From: sevendev Date: Thu, 25 Sep 2025 19:51:07 +0900 Subject: [PATCH 16/24] another try --- .github/actions/build/action.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 3b481995..911a7223 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -81,6 +81,14 @@ runs: fi shell: ${{ inputs.shell_type }} + - name: Patch glTF-SDK CMakeLists.txt + run: | + FILE="3rdparty/glTF-SDK/CMakeLists.txt" + if grep -q "cmake_minimum_required(VERSION 2.8)" "$FILE"; then + sed -i '' 's/cmake_minimum_required(VERSION 2.8)/cmake_minimum_required(VERSION 3.5)/' "$FILE" + fi + shell: ${{ inputs.shell_type }} + # Windowsのみコンパイラパスを通します。 - name: Add msbuild to PATH if: runner.os == 'Windows' From 62aed5178070a8ea88633c2bae0e3f2ef6bcd22b Mon Sep 17 00:00:00 2001 From: sevendev Date: Thu, 25 Sep 2025 19:53:58 +0900 Subject: [PATCH 17/24] another --- .github/actions/build/action.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 911a7223..d2c7e7aa 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -73,16 +73,12 @@ runs: $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden shell: ${{ inputs.shell_type }} - - name: Patch libcitygml CMakeLists.txt + - name: Patch CMakeLists.txt run: | FILE="3rdparty/libcitygml/CMakeLists.txt" if grep -q "cmake_minimum_required(VERSION 2.8)" "$FILE"; then sed -i '' 's/cmake_minimum_required(VERSION 2.8)/cmake_minimum_required(VERSION 3.5)/' "$FILE" fi - shell: ${{ inputs.shell_type }} - - - name: Patch glTF-SDK CMakeLists.txt - run: | FILE="3rdparty/glTF-SDK/CMakeLists.txt" if grep -q "cmake_minimum_required(VERSION 2.8)" "$FILE"; then sed -i '' 's/cmake_minimum_required(VERSION 2.8)/cmake_minimum_required(VERSION 3.5)/' "$FILE" From 035393edf6ed6a460c8ad80289d85f3947a7c99c Mon Sep 17 00:00:00 2001 From: sevendev Date: Fri, 26 Sep 2025 09:05:26 +0900 Subject: [PATCH 18/24] another --- .github/actions/build/action.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index d2c7e7aa..13d33bee 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -76,12 +76,12 @@ runs: - name: Patch CMakeLists.txt run: | FILE="3rdparty/libcitygml/CMakeLists.txt" - if grep -q "cmake_minimum_required(VERSION 2.8)" "$FILE"; then - sed -i '' 's/cmake_minimum_required(VERSION 2.8)/cmake_minimum_required(VERSION 3.5)/' "$FILE" + if grep -q "CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0 FATAL_ERROR)" "$FILE"; then + sed -i 's/CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0 FATAL_ERROR)/cmake_minimum_required(VERSION 3.8)/' "$FILE" fi FILE="3rdparty/glTF-SDK/CMakeLists.txt" - if grep -q "cmake_minimum_required(VERSION 2.8)" "$FILE"; then - sed -i '' 's/cmake_minimum_required(VERSION 2.8)/cmake_minimum_required(VERSION 3.5)/' "$FILE" + if grep -q "cmake_minimum_required(VERSION 3.5)" "$FILE"; then + sed -i 's/cmake_minimum_required(VERSION 3.5)/cmake_minimum_required(VERSION 3.8)/' "$FILE" fi shell: ${{ inputs.shell_type }} From 9cf9d04a11b8650878a4c7104f22d0e14eeafb07 Mon Sep 17 00:00:00 2001 From: sevendev Date: Fri, 26 Sep 2025 09:15:03 +0900 Subject: [PATCH 19/24] =?UTF-8?q?cmake=20version=E6=8C=87=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/actions/build/action.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 13d33bee..04e22268 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -40,6 +40,13 @@ runs: run: sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev shell: ${{ inputs.shell_type }} + # CMakeのセットアップ + - name: Setup CMake + uses: lukka/get-cmake@latest + with: + cmakeVersion: '3.25.2' # ← 使用したいバージョンを指定 + shell: ${{ inputs.shell_type }} + # Unreal Engineと合わせたバージョンでMSVCを用意する準備として、始めからある望みでないバージョンを消します。 # 参考: https://github.com/actions/runner-images/issues/9701 - name: Delete components @@ -73,18 +80,6 @@ runs: $process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden shell: ${{ inputs.shell_type }} - - name: Patch CMakeLists.txt - run: | - FILE="3rdparty/libcitygml/CMakeLists.txt" - if grep -q "CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0 FATAL_ERROR)" "$FILE"; then - sed -i 's/CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0 FATAL_ERROR)/cmake_minimum_required(VERSION 3.8)/' "$FILE" - fi - FILE="3rdparty/glTF-SDK/CMakeLists.txt" - if grep -q "cmake_minimum_required(VERSION 3.5)" "$FILE"; then - sed -i 's/cmake_minimum_required(VERSION 3.5)/cmake_minimum_required(VERSION 3.8)/' "$FILE" - fi - shell: ${{ inputs.shell_type }} - # Windowsのみコンパイラパスを通します。 - name: Add msbuild to PATH if: runner.os == 'Windows' From ea5ea728c209fbfd1f810831a6082332ed807d93 Mon Sep 17 00:00:00 2001 From: sevendev Date: Fri, 26 Sep 2025 09:20:18 +0900 Subject: [PATCH 20/24] cmake version 2nd try --- .github/actions/build/action.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 04e22268..1a19e178 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -42,9 +42,12 @@ runs: # CMakeのセットアップ - name: Setup CMake - uses: lukka/get-cmake@latest + uses: jwlawson/actions-setup-cmake@v1 with: - cmakeVersion: '3.25.2' # ← 使用したいバージョンを指定 + version: '3.25.2' + + - name: Check CMake version + run: cmake --version shell: ${{ inputs.shell_type }} # Unreal Engineと合わせたバージョンでMSVCを用意する準備として、始めからある望みでないバージョンを消します。 From 8525d231296752b450958eec0dc00b2b035e256c Mon Sep 17 00:00:00 2001 From: sevendev Date: Fri, 26 Sep 2025 09:26:59 +0900 Subject: [PATCH 21/24] cmake version --- .github/actions/build/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 1a19e178..6824af73 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -42,9 +42,9 @@ runs: # CMakeのセットアップ - name: Setup CMake - uses: jwlawson/actions-setup-cmake@v1 + uses: lukka/get-cmake@latest with: - version: '3.25.2' + cmakeVersion: '3.25.2' # ← 使用したいバージョンを指定 - name: Check CMake version run: cmake --version From 65ef1b8f81f80a912e7951ebca4c7cf369e36891 Mon Sep 17 00:00:00 2001 From: sevendev Date: Fri, 26 Sep 2025 10:14:47 +0900 Subject: [PATCH 22/24] =?UTF-8?q?mac=20=E3=81=AE=E3=81=BF=20cmake=20versio?= =?UTF-8?q?n=E3=82=923.27=E3=81=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/actions/build/action.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 6824af73..7740e3b3 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -40,11 +40,12 @@ runs: run: sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev shell: ${{ inputs.shell_type }} - # CMakeのセットアップ - - name: Setup CMake + # Mac向けのCMakeのセットアップ + - name: Setup CMake on macOS + if: runner.os == 'macOS' uses: lukka/get-cmake@latest with: - cmakeVersion: '3.25.2' # ← 使用したいバージョンを指定 + cmakeVersion: '3.27.x' # cmakeバージョンを指定 - name: Check CMake version run: cmake --version @@ -106,7 +107,6 @@ runs: -D BUILD_LIB_TYPE=dynamic -D RUNTIME_LIB_TYPE=MT -D CMAKE_OSX_ARCHITECTURES:STRING="${{ inputs.arch }}" - -D CMAKE_POLICY_VERSION_MINIMUM=3.5 ${{ env.ADDITIONAL_CMAKE_OPTIONS }} shell: ${{ inputs.shell_type }} # 10万行超えの警告が出るので一時的な処置として警告を抑制しています。 From 238e96c5a87c7d3d7c8b4964ea8b5d6c8917f145 Mon Sep 17 00:00:00 2001 From: sevendev Date: Fri, 26 Sep 2025 10:53:13 +0900 Subject: [PATCH 23/24] =?UTF-8?q?mobile=20build=E7=94=A8=20cmake=20version?= =?UTF-8?q?=20=E8=A8=AD=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/actions/upload-mobile-dlls/action.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/actions/upload-mobile-dlls/action.yml b/.github/actions/upload-mobile-dlls/action.yml index 0c9bb08b..228073e2 100644 --- a/.github/actions/upload-mobile-dlls/action.yml +++ b/.github/actions/upload-mobile-dlls/action.yml @@ -56,6 +56,13 @@ runs: - name: Install ninja-build tool uses: seanmiddleditch/gha-setup-ninja@v3 + # Mac向けのCMakeのセットアップ + - name: Setup CMake on macOS + if: runner.os == 'macOS' + uses: lukka/get-cmake@latest + with: + cmakeVersion: '3.27.x' # cmakeバージョンを指定 + - name: Configure CMake for Android if: runner.os == 'Linux' run: > From 494c0e7b42a4202bd2d0ef42f468d1d5270b4a8e Mon Sep 17 00:00:00 2001 From: sevendev Date: Fri, 26 Sep 2025 11:02:52 +0900 Subject: [PATCH 24/24] =?UTF-8?q?=E6=97=A2=E5=AD=98=E3=81=AEios=20upload?= =?UTF-8?q?=E3=81=8C=E6=AD=A3=E5=B8=B8=E3=81=AB=E5=8B=95=E4=BD=9C=E3=81=97?= =?UTF-8?q?=E3=81=A6=E3=81=84=E3=81=AA=E3=81=8B=E3=81=A3=E3=81=9F=EF=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/actions/upload-mobile-dlls/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/upload-mobile-dlls/action.yml b/.github/actions/upload-mobile-dlls/action.yml index 228073e2..53d316a5 100644 --- a/.github/actions/upload-mobile-dlls/action.yml +++ b/.github/actions/upload-mobile-dlls/action.yml @@ -78,7 +78,7 @@ runs: shell: ${{ inputs.shell_type }} - name: Configure CMake for iOS - if: runner.os == 'MacOS' + if: runner.os == 'macOS' run: > cmake -S ${{github.workspace}} @@ -102,7 +102,7 @@ runs: path: ${{github.workspace}}/out/build/x64-Release/src/libplateau.so - name: Upload framework for iOS - if: runner.os == 'MacOS' + if: runner.os == 'macOS' uses: actions/upload-artifact@v4 with: name: libplateau-ios-dll