From 774b32a236aa4b57d0799448f90ac40bf5e9a2df Mon Sep 17 00:00:00 2001 From: Joris Vaillant Date: Wed, 24 Jul 2024 14:34:13 +0200 Subject: [PATCH 1/7] cmake: Set policy CMP0167 to avoid warnings with CMake 3.30 --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index cbbbe84dc..7ea596a24 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,6 +89,12 @@ else() endif() endif() + +# Use BoostConfig module distributed by boost library instead of using FindBoost module distributed +# by CMake +if(POLICY CMP0167) + cmake_policy(SET CMP0167 NEW) +endif() include("${JRL_CMAKE_MODULES}/boost.cmake") include("${JRL_CMAKE_MODULES}/python.cmake") include("${JRL_CMAKE_MODULES}/hpp.cmake") From db45be69ddf5332a3ff9e61c7974598ae944dfc9 Mon Sep 17 00:00:00 2001 From: Joris Vaillant Date: Wed, 24 Jul 2024 14:36:26 +0200 Subject: [PATCH 2/7] changelog: Add changelog entry --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index db5ef76b1..42d675e20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -51,6 +51,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - Fix issue in Octomap.computeLocalAABB - Fix unsupported function for contact_patch_matrix - Fix Octomap dependency on ROS +- Remove CMake CMP0167 warnings ## [2.4.4] - 2024-03-06 From 23b3a0bedaa236d6366e023449dced1c29389c31 Mon Sep 17 00:00:00 2001 From: Joris Vaillant Date: Wed, 24 Jul 2024 17:06:03 +0200 Subject: [PATCH 3/7] ci: debug --- .github/workflows/windows-conda-clang.yml | 3 ++- .github/workflows/windows-conda-v142.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/windows-conda-clang.yml b/.github/workflows/windows-conda-clang.yml index 7d7a8d87a..3f708a45d 100644 --- a/.github/workflows/windows-conda-clang.yml +++ b/.github/workflows/windows-conda-clang.yml @@ -43,6 +43,7 @@ jobs: shell: cmd /C CALL {0} run: | call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 + call conda list :: Tell Ninja to use clang-cl set CC=clang-cl set CXX=clang-cl @@ -65,7 +66,7 @@ jobs: if errorlevel 1 exit 1 :: Build and Install - cmake --build . --config Release --target install + ninja install -v if errorlevel 1 exit 1 :: Testing diff --git a/.github/workflows/windows-conda-v142.yml b/.github/workflows/windows-conda-v142.yml index e1191d014..dca1cb6f5 100644 --- a/.github/workflows/windows-conda-v142.yml +++ b/.github/workflows/windows-conda-v142.yml @@ -42,6 +42,7 @@ jobs: shell: cmd /C CALL {0} run: | call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 + call conda list :: Create build mkdir build @@ -62,7 +63,7 @@ jobs: if errorlevel 1 exit 1 :: Build and Install - cmake --build . --config Release --target install + ninja install -v if errorlevel 1 exit 1 :: Testing From cbf1ee9c1fd55befca1d6e9ba411104d8d89b71e Mon Sep 17 00:00:00 2001 From: Joris Vaillant Date: Fri, 26 Jul 2024 11:56:45 +0200 Subject: [PATCH 4/7] ci: Remove ccache to debug --- .github/workflows/windows-conda-clang.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/windows-conda-clang.yml b/.github/workflows/windows-conda-clang.yml index 3f708a45d..9a9c0b2a5 100644 --- a/.github/workflows/windows-conda-clang.yml +++ b/.github/workflows/windows-conda-clang.yml @@ -55,7 +55,6 @@ jobs: cmake ^ -G "Ninja" ^ -DCMAKE_INSTALL_PREFIX=%CONDA_PREFIX%\Library ^ - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache ^ -DCMAKE_BUILD_TYPE=Release ^ -DGENERATE_PYTHON_STUBS=ON ^ -DPYTHON_SITELIB=%CONDA_PREFIX%\Lib\site-packages ^ From 1bf9e14140179b73a5a4cf9cecc5986e686720bc Mon Sep 17 00:00:00 2001 From: Joris Vaillant Date: Fri, 26 Jul 2024 12:09:11 +0200 Subject: [PATCH 5/7] ci: Add cxx-compiler to Windows build --- .github/workflows/conda/environment_windows.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/conda/environment_windows.yml b/.github/workflows/conda/environment_windows.yml index febe634ee..f4bdeeb41 100644 --- a/.github/workflows/conda/environment_windows.yml +++ b/.github/workflows/conda/environment_windows.yml @@ -16,5 +16,6 @@ dependencies: - qhull - cmake - ccache + - cxx-compiler - pkg-config - ninja From 9b3741dfdb9960386a3e85a646489d2a5c3fb9e7 Mon Sep 17 00:00:00 2001 From: Joris Vaillant Date: Fri, 26 Jul 2024 12:27:41 +0200 Subject: [PATCH 6/7] ci: Don't call vcvarsall.bat --- .github/workflows/windows-conda-clang.yml | 1 - .github/workflows/windows-conda-v142.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/workflows/windows-conda-clang.yml b/.github/workflows/windows-conda-clang.yml index 9a9c0b2a5..196aba827 100644 --- a/.github/workflows/windows-conda-clang.yml +++ b/.github/workflows/windows-conda-clang.yml @@ -42,7 +42,6 @@ jobs: - name: Build Coal shell: cmd /C CALL {0} run: | - call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 call conda list :: Tell Ninja to use clang-cl set CC=clang-cl diff --git a/.github/workflows/windows-conda-v142.yml b/.github/workflows/windows-conda-v142.yml index dca1cb6f5..a33095917 100644 --- a/.github/workflows/windows-conda-v142.yml +++ b/.github/workflows/windows-conda-v142.yml @@ -41,7 +41,6 @@ jobs: - name: Build Coal shell: cmd /C CALL {0} run: | - call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64 call conda list :: Create build From 47f046a0d447a063200bc0a15ec614880b96008f Mon Sep 17 00:00:00 2001 From: Joris Vaillant Date: Fri, 26 Jul 2024 14:37:58 +0200 Subject: [PATCH 7/7] cmake: Revert policy change to debug --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ea596a24..bb1fcf8c1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -92,9 +92,9 @@ endif() # Use BoostConfig module distributed by boost library instead of using FindBoost module distributed # by CMake -if(POLICY CMP0167) - cmake_policy(SET CMP0167 NEW) -endif() +# if(POLICY CMP0167) +# cmake_policy(SET CMP0167 NEW) +# endif() include("${JRL_CMAKE_MODULES}/boost.cmake") include("${JRL_CMAKE_MODULES}/python.cmake") include("${JRL_CMAKE_MODULES}/hpp.cmake")