From 792dba28fbc94e2b6659d2a2fc312d1be0eb6c78 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Tue, 22 Dec 2020 00:16:48 +0100 Subject: [PATCH] build: test_package CI build fixed --- .github/workflows/ci-test-package-cmake.yml | 3 ++- test_package/CMakeLists.txt | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-test-package-cmake.yml b/.github/workflows/ci-test-package-cmake.yml index 4bc698d3..9710dda1 100644 --- a/.github/workflows/ci-test-package-cmake.yml +++ b/.github/workflows/ci-test-package-cmake.yml @@ -89,7 +89,8 @@ jobs: - name: Configure test_package CMake run: | mkdir -p test_package/build/${{ matrix.build_type }} && cd test_package/build/${{ matrix.build_type }} - cmake ../.. -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_INSTALL_PREFIX=../../../build/${{ matrix.build_type }}/test_package -DCMAKE_TOOLCHAIN_FILE=../../../build/${{ matrix.build_type }}/conan_toolchain.cmake + conan install ../../.. -s compiler.cppstd=20 -s compiler.libcxx=libstdc++11 -s build_type=${{ matrix.build_type }} + cmake ../.. -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -DCMAKE_INSTALL_PREFIX=../../../build/${{ matrix.build_type }}/test_package -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake - name: Build test_package run: | cd test_package/build/${{ matrix.build_type }} diff --git a/test_package/CMakeLists.txt b/test_package/CMakeLists.txt index 02b59d0a..446056c0 100644 --- a/test_package/CMakeLists.txt +++ b/test_package/CMakeLists.txt @@ -23,9 +23,6 @@ cmake_minimum_required(VERSION 3.15) project(test_package) -# enable package discovery based on the local configuration files -list(PREPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}) - find_package(mp-units CONFIG REQUIRED) add_executable(test_package test_package.cpp)