From e887196d9d67e48c69168257d599371abf1c3b31 Mon Sep 17 00:00:00 2001 From: Chip Kerchner Date: Fri, 17 Mar 2023 16:06:26 +0000 Subject: [PATCH] Undo cmake pools changes --- CMakeLists.txt | 7 ------- ci/build.gitlab-ci.yml | 3 +-- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 799cd7122..fbcfc58c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -687,13 +687,6 @@ else (CMAKE_VERSION VERSION_LESS 3.14) ARCH_INDEPENDENT) endif (CMAKE_VERSION VERSION_LESS 3.14) -# Build and link pool requires CMake 3.11 -if (CMAKE_VERSION VERSION_LESS 3.11) - unset (CMAKE_JOB_POOL_COMPILE) - unset (CMAKE_JOB_POOL_LINK) - unset (CMAKE_JOB_POOLS) -endif (CMAKE_VERSION VERSION_LESS 3.11) - # The Eigen target will be located in the Eigen3 namespace. Other CMake # targets can refer to it using Eigen3::Eigen. export (TARGETS eigen NAMESPACE Eigen3:: FILE Eigen3Targets.cmake) diff --git a/ci/build.gitlab-ci.yml b/ci/build.gitlab-ci.yml index edfd98530..073212aa8 100644 --- a/ci/build.gitlab-ci.yml +++ b/ci/build.gitlab-ci.yml @@ -121,7 +121,7 @@ build:ppc64le:linux:gcc-10:cxx11-on: EIGEN_CI_CXX_COMPILER: "g++-10" EIGEN_CI_CC_COMPILER: "gcc-10" EIGEN_TEST_CXX11: "on" - EIGEN_CI_ADDITIONAL_ARGS: "-DCMAKE_CXX_FLAGS='-DEIGEN_ALTIVEC_DISABLE_MMA' -DCMAKE_JOB_POOL_COMPILE:STRING=compile -DCMAKE_JOB_POOL_LINK:STRING=link '-DCMAKE_JOB_POOLS:STRING=compile=8;link=4'" + EIGEN_CI_ADDITIONAL_ARGS: "-DCMAKE_CXX_FLAGS='-DEIGEN_ALTIVEC_DISABLE_MMA'" tags: - eigen-runner - linux @@ -135,7 +135,6 @@ build:ppc64le:linux:clang-10:cxx11-on: EIGEN_CI_CXX_COMPILER: "clang++-10" EIGEN_CI_CC_COMPILER: "clang-10" EIGEN_TEST_CXX11: "on" - EIGEN_CI_ADDITIONAL_ARGS: "-DCMAKE_JOB_POOL_COMPILE:STRING=compile -DCMAKE_JOB_POOL_LINK:STRING=link '-DCMAKE_JOB_POOLS:STRING=compile=8;link=4'" tags: - eigen-runner - linux