From 01bb6e1bcfe6b70880ffd462861de3b974c1c26e Mon Sep 17 00:00:00 2001 From: Syping Date: Sat, 4 Sep 2021 17:24:22 +0200 Subject: [PATCH] Fix CMake top-level detection, install build with CI --- .github/workflows/ubuntu.yml | 2 ++ CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 9bb3935..39008d8 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -22,3 +22,5 @@ jobs: run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -GNinja - name: Build run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} + - name: Install + run: cmake --install ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} diff --git a/CMakeLists.txt b/CMakeLists.txt index caa0c40..0cd24e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,7 +93,7 @@ if (WITH_QT_EXAMPLE) add_subdirectory(examples/ragephoto-qtviewer) endif() -if (CMAKE_PROJECT_NAME EQUAL "ragephoto") +if (${CMAKE_PROJECT_NAME} STREQUAL "ragephoto") option(WITH_EXTRACT "Build libragephoto with ragephoto-extract" ON) else() option(WITH_EXTRACT "Build libragephoto with ragephoto-extract" OFF)