This is an automated email from the ASF dual-hosted git repository. pengzheng pushed a commit to branch hotfix/update-ubuntu-CI in repository https://gitbox.apache.org/repos/asf/celix.git
commit bfccf0e44b7f328afbf9a2ce9484d55688da2486 Author: PengZheng <[email protected]> AuthorDate: Thu Jul 11 10:14:08 2024 +0800 Update linux-build-apt to use ninja. --- .github/workflows/ubuntu.yml | 4 +++- CMakeLists.txt | 5 ----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index d5b87a93f..6a1079536 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -110,6 +110,7 @@ jobs: sudo apt-get update sudo apt-get install -yq --no-install-recommends \ build-essential \ + ninja-build \ curl \ uuid-dev \ libzip-dev \ @@ -145,11 +146,12 @@ jobs: -DENABLE_TESTING_ON_CI=ON -DCMAKE_BUILD_TYPE=${{ matrix.type }} -DENABLE_CCACHE=ON + -G Ninja run: | mkdir build install cd build cmake ${BUILD_OPTIONS} -DCMAKE_INSTALL_PREFIX=../install .. - make -j $(nproc) && make install + ninja && ninja install - name: Test run: | cd $GITHUB_WORKSPACE/build diff --git a/CMakeLists.txt b/CMakeLists.txt index f0aa5aa5c..d72ce4d76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,11 +31,6 @@ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -# see https://public.kitware.com/Bug/view.php?id=15696 -IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} EQUAL 3.3 AND ${CMAKE_GENERATOR} STREQUAL "Unix Makefiles") - message( FATAL_ERROR "Building Celix using CMake 3.3 and makefiles is not supported due to a bug in the Makefile Generator (see Bug 15696). Please change the used CMake version - both, CMake 3.2 and CMake 3.4 are working fine. Or use a different generator (e.g. Ninja)." ) -ENDIF() - # Options option(ENABLE_TESTING "Enables unit/bundle testing" FALSE) if (ENABLE_TESTING)
