From 024fd752f61718424c895cc3be9257c6ae276e8a Mon Sep 17 00:00:00 2001 From: Daniel Nicoletti Date: Sun, 3 Nov 2024 08:16:03 -0300 Subject: [PATCH] Fix CI docs/nightly --- .github/workflows/documentation.yml | 2 +- .github/workflows/nightly.yml | 2 +- CMakeLists.txt | 2 -- src/CMakeLists.txt | 1 - 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml index 926dc1e..380d751 100644 --- a/.github/workflows/documentation.yml +++ b/.github/workflows/documentation.yml @@ -28,7 +28,7 @@ jobs: - name: Install Dependencies on Linux run: | sudo apt update -qq - sudo apt install -y doxygen graphviz postgresql-server-dev-all + sudo apt install -y doxygen graphviz postgresql-server-dev-16 - name: Install Qt uses: jurplel/install-qt-action@v4 diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index ea16df4..ad486e1 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -29,7 +29,7 @@ jobs: if: runner.os == 'Linux' run: | sudo apt update -qq - sudo apt install -y clazy doxygen graphviz postgresql-server-dev-all + sudo apt install -y clazy doxygen graphviz postgresql-server-dev-16 - name: Install Qt ${{ matrix.config.qt_version }} with options and default aqtversion uses: jurplel/install-qt-action@v4 diff --git a/CMakeLists.txt b/CMakeLists.txt index ead9da5..b968a4d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,8 +39,6 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) "/usr" CACHE PATH "asql default install prefix" FORCE) endif() -add_definitions("-DLOCALSTATEDIR=\"${LOCALSTATEDIR}\"") - set(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib/${CMAKE_LIBRARY_ARCHITECTURE}" CACHE PATH "Output directory for libraries") option(BUILD_SHARED_LIBS "Build in shared lib mode" ON) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6452d7c..4444a26 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -32,7 +32,6 @@ set(asql_HEADERS add_library(ASqlQt${QT_VERSION_MAJOR} ${asql_SRC} ${asql_HEADERS} - ${asql_HEADERS_PRIVATE} ) generate_export_header(ASqlQt${QT_VERSION_MAJOR} BASE_NAME ASQL