From 2b7cb23922ecea9b60f441014cf6fe5d4728681f Mon Sep 17 00:00:00 2001 From: Jarle Aase Date: Sat, 9 Mar 2024 18:15:06 +0200 Subject: [PATCH 1/9] Added experimental conan build to the workflow --- .github/workflows/ci.yaml | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9f082a2..8314429 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,12 +14,12 @@ jobs: include: - os: ubuntu-latest compiler: gcc - - os: ubuntu-latest - compiler: clang - - os: windows-latest - compiler: msvc - - os: macos-latest - compiler: clang + # - os: ubuntu-latest + # compiler: clang + # - os: windows-latest + # compiler: msvc + # - os: macos-latest + # compiler: clang steps: - name: Checkout code @@ -80,10 +80,28 @@ jobs: cmake .. -DCMAKE_BUILD_TYPE=Release -G "Ninja" -DCMAKE_TOOLCHAIN_FILE=~/vcpkg/scripts/buildsystems/vcpkg.cmake cmake --build . popd - - name: Run tests run: | pushd build ctest -C Release popd + + - name: install python + uses: actions/setup-python@v2 + with: + python-version: 3.12 + - name: Install pipx + uses: CfirTsabari/actions-pipx@v1 + + - name: Install Conan + run: | + pipx install conan + conan profile new default --detect + + - name: Test build with Conan + run: | + mkdir conan-build && cd conan-build + conan install .. --build missing + conan create .. --build 'logfault/*' + From 39f81e31a06f5fa646380bc9bc3be8d4d7040d42 Mon Sep 17 00:00:00 2001 From: Jarle Aase Date: Sat, 9 Mar 2024 18:19:01 +0200 Subject: [PATCH 2/9] Trying to get the conan build working --- .github/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8314429..c0f13ab 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -97,7 +97,7 @@ jobs: - name: Install Conan run: | pipx install conan - conan profile new default --detect + conan profile detect --force - name: Test build with Conan run: | From bd1c8136a248f4328f19cd3bedcf00fe42c9c55c Mon Sep 17 00:00:00 2001 From: Jarle Aase Date: Sat, 9 Mar 2024 18:50:51 +0200 Subject: [PATCH 3/9] Trying to get the conan build working --- CMakeLists.txt | 7 +++++++ tests/CMakeLists.txt | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a06b9d2..d44bb0e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,13 @@ include(GNUInstallDirs) set(LOGFAULT_ROOT ${CMAKE_CURRENT_SOURCE_DIR}) +message(STATUS "Using ${CMAKE_CXX_COMPILER}") + +macro(SET_CPP_STANDARD target) + message(STATUS "Using C++ 11 for ${target}") + set_property(TARGET ${target} PROPERTY CXX_STANDARD 11) +endmacro(SET_CPP_STANDARD) + find_package (Threads) set(DEFAULT_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) include_directories( diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 648dfd7..f053d48 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -20,6 +20,9 @@ option(WITH_QT "Enable QT" OFF) ####### default_to_clog +message ("GTEST_INCLUDE_DIRS: ${GTEST_INCLUDE_DIRS}") +message ("GTest_INCLUDE_DIRS: ${GTest_INCLUDE_DIRS}") + add_executable(default_to_clog default_to_clog.cpp ) @@ -31,6 +34,7 @@ target_include_directories(default_to_clog ${CMAKE_CURRENT_SOURCE_DIR} ${LOGFAULT_ROOT}/include ${GTEST_INCLUDE_DIRS} + ${CMAKE_BINARY_DIR}/exports ) target_link_libraries(default_to_clog @@ -55,6 +59,7 @@ target_include_directories(default_to_clog_with_tid ${CMAKE_CURRENT_SOURCE_DIR} ${LOGFAULT_ROOT}/include ${GTEST_INCLUDE_DIRS} + ${CMAKE_BINARY_DIR}/exports ) target_link_libraries(default_to_clog_with_tid From df561bc0ae8784e3e43ccd81bf83ac14778011b9 Mon Sep 17 00:00:00 2001 From: Jarle Aase Date: Sat, 9 Mar 2024 18:53:52 +0200 Subject: [PATCH 4/9] Trying to get the conan build working --- tests/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f053d48..86b1da5 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -34,6 +34,7 @@ target_include_directories(default_to_clog ${CMAKE_CURRENT_SOURCE_DIR} ${LOGFAULT_ROOT}/include ${GTEST_INCLUDE_DIRS} + ${GTest_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/exports ) @@ -59,6 +60,7 @@ target_include_directories(default_to_clog_with_tid ${CMAKE_CURRENT_SOURCE_DIR} ${LOGFAULT_ROOT}/include ${GTEST_INCLUDE_DIRS} + ${GTest_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/exports ) From 21246d165620d055be724526bb0c629302e3569f Mon Sep 17 00:00:00 2001 From: Jarle Aase Date: Sat, 9 Mar 2024 19:08:59 +0200 Subject: [PATCH 5/9] Trying to get the conan build working --- tests/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 86b1da5..e0b3279 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,6 +1,9 @@ +message ("GTEST_LIBRARIES: ${GTEST_LIBRARIES}") +message ("GTest_LIBRARIES: ${GTest_LIBRARIES}") + if (NOT GTEST_LIBRARIES) - set (GTEST_LIBRARIES gtest) + set (GTEST_LIBRARIES gtest::gtest) endif() option(WITH_QT "Enable QT" OFF) From 3f2b1f8bd5f2a2a158adf4eb855e61d92c07b889 Mon Sep 17 00:00:00 2001 From: Jarle Aase Date: Sat, 9 Mar 2024 19:15:21 +0200 Subject: [PATCH 6/9] Trying to get the conan build working --- tests/CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e0b3279..3d00c62 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,6 +1,4 @@ -message ("GTEST_LIBRARIES: ${GTEST_LIBRARIES}") -message ("GTest_LIBRARIES: ${GTest_LIBRARIES}") if (NOT GTEST_LIBRARIES) set (GTEST_LIBRARIES gtest::gtest) @@ -23,9 +21,15 @@ option(WITH_QT "Enable QT" OFF) ####### default_to_clog +message ("GTEST_LIBRARIES: ${GTEST_LIBRARIES}") +message ("GTest_LIBRARIES: ${GTest_LIBRARIES}") + message ("GTEST_INCLUDE_DIRS: ${GTEST_INCLUDE_DIRS}") message ("GTest_INCLUDE_DIRS: ${GTest_INCLUDE_DIRS}") +message("CONAN_LIBS: ${CONAN_LIBS}") +message("CONAN_INCLUDE_DIRS: ${CONAN_INCLUDE_DIRS}") + add_executable(default_to_clog default_to_clog.cpp ) From 3bb27fbec714c9867d519f827cbf4faf940a13c7 Mon Sep 17 00:00:00 2001 From: Jarle Aase Date: Sat, 9 Mar 2024 19:17:27 +0200 Subject: [PATCH 7/9] Trying to get the conan build working --- tests/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 3d00c62..604f5df 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -40,13 +40,13 @@ target_include_directories(default_to_clog PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${LOGFAULT_ROOT}/include - ${GTEST_INCLUDE_DIRS} +# ${GTEST_INCLUDE_DIRS} ${GTest_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/exports ) target_link_libraries(default_to_clog - ${GTEST_LIBRARIES} + ${GTest_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) @@ -66,13 +66,13 @@ target_include_directories(default_to_clog_with_tid PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${LOGFAULT_ROOT}/include - ${GTEST_INCLUDE_DIRS} +# ${GTEST_INCLUDE_DIRS} ${GTest_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/exports ) target_link_libraries(default_to_clog_with_tid - ${GTEST_LIBRARIES} + ${GTest_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) From 2a3b52fe6ff285f54c4b95f345dc04b5f1ac417f Mon Sep 17 00:00:00 2001 From: Jarle Aase Date: Sat, 9 Mar 2024 19:27:22 +0200 Subject: [PATCH 8/9] Trying to get the conan build working --- .github/workflows/ci.yaml | 1 + tests/CMakeLists.txt | 32 +++++++++++++++++--------------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c0f13ab..4a32959 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -37,6 +37,7 @@ jobs: ${{ env.XDG_CACHE_HOME }}/vcpkg/archives ${{ env.LOCALAPPDATA }}\vcpkg\archives ${{ env.APPDATA }}\vcpkg\archives + ${{ env.HOME }}/.conan2 key: ${{ runner.os }}-${{ matrix.compiler }}-${{ env.BUILD_TYPE }}-${{ hashFiles('**/CMakeLists.txt') }}-${{ hashFiles('./vcpkg.json')}} restore-keys: | ${{ runner.os }}-${{ env.BUILD_TYPE }}- diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 604f5df..ec7bc74 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,7 +1,17 @@ +message ("GTEST_LIBRARIES: ${GTEST_LIBRARIES}") +message ("GTest_LIBRARIES: ${GTest_LIBRARIES}") + +message ("GTEST_INCLUDE_DIRS: ${GTEST_INCLUDE_DIRS}") +message ("GTest_INCLUDE_DIRS: ${GTest_INCLUDE_DIRS}") + if (NOT GTEST_LIBRARIES) - set (GTEST_LIBRARIES gtest::gtest) + set (GTEST_LIBRARIES ${GTest_LIBRARIES}) +endif() + +if (NOT GTEST_INCLUDE_DIRS) + set (GTEST_INCLUDE_DIRS ${GTest_INCLUDE_DIRS}) endif() option(WITH_QT "Enable QT" OFF) @@ -21,14 +31,6 @@ option(WITH_QT "Enable QT" OFF) ####### default_to_clog -message ("GTEST_LIBRARIES: ${GTEST_LIBRARIES}") -message ("GTest_LIBRARIES: ${GTest_LIBRARIES}") - -message ("GTEST_INCLUDE_DIRS: ${GTEST_INCLUDE_DIRS}") -message ("GTest_INCLUDE_DIRS: ${GTest_INCLUDE_DIRS}") - -message("CONAN_LIBS: ${CONAN_LIBS}") -message("CONAN_INCLUDE_DIRS: ${CONAN_INCLUDE_DIRS}") add_executable(default_to_clog default_to_clog.cpp @@ -40,13 +42,13 @@ target_include_directories(default_to_clog PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${LOGFAULT_ROOT}/include -# ${GTEST_INCLUDE_DIRS} - ${GTest_INCLUDE_DIRS} + ${GTEST_INCLUDE_DIRS} + #${GTest_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/exports ) target_link_libraries(default_to_clog - ${GTest_LIBRARIES} + ${GTEST_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) @@ -66,13 +68,13 @@ target_include_directories(default_to_clog_with_tid PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${LOGFAULT_ROOT}/include -# ${GTEST_INCLUDE_DIRS} - ${GTest_INCLUDE_DIRS} + ${GTEST_INCLUDE_DIRS} + #${GTest_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/exports ) target_link_libraries(default_to_clog_with_tid - ${GTest_LIBRARIES} + ${GTEST_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ) From c35547c1cd205da57dd5b38185ea6f12cb703a1c Mon Sep 17 00:00:00 2001 From: Jarle Aase Date: Sat, 9 Mar 2024 19:30:38 +0200 Subject: [PATCH 9/9] Trying to get the conan build working --- .github/workflows/ci.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 4a32959..5a647dd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -14,12 +14,12 @@ jobs: include: - os: ubuntu-latest compiler: gcc - # - os: ubuntu-latest - # compiler: clang - # - os: windows-latest - # compiler: msvc - # - os: macos-latest - # compiler: clang + - os: ubuntu-latest + compiler: clang + - os: windows-latest + compiler: msvc + - os: macos-latest + compiler: clang steps: - name: Checkout code