From 79d168b7c49c4ee17e0471491a4970f58b740717 Mon Sep 17 00:00:00 2001 From: Shaun Reed Date: Sun, 9 Apr 2023 10:15:30 -0400 Subject: [PATCH] ci --- CMakeLists.txt | 10 ++++++---- cmake/templates/Config.cmake.in | 4 ++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 92588ff..12fbc25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,17 +67,19 @@ option( OFF ) -if(NOT QTK_DEBUG) - set(CMAKE_BUILD_TYPE Release) -else() +if(QTK_DEBUG OR CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]") + set(QTK_DEBUG ON) set(CMAKE_BUILD_TYPE Debug) +else() + set(QTK_DEBUG OFF) + set(CMAKE_BUILD_TYPE Release) endif() # This should be set to your Qt6 installation directory. set(QT_INSTALL_DIR "$ENV{HOME}/Qt/6.5.0/gcc_64" CACHE PATH "Path to Qt6 install.") set(Qt6_DIR "$ENV{HOME}/Qt/6.5.0/gcc_64/lib/") if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install") + set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/install") endif () # Point CMAKE_PREFIX_PATH to Qt6 install directory # If Qtk is built within Qt Creator this is not required. diff --git a/cmake/templates/Config.cmake.in b/cmake/templates/Config.cmake.in index d1383f2..cd8a459 100644 --- a/cmake/templates/Config.cmake.in +++ b/cmake/templates/Config.cmake.in @@ -6,4 +6,8 @@ set_and_check(QTK_EXECUTABLE "${PACKAGE_PREFIX_DIR}/bin/qtk_gui") set_and_check(QTK_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/include") set_and_check(QTK_LIBRARIES "${PACKAGE_PREFIX_DIR}/lib") +set_and_check(Qtk_EXECUTABLE "${PACKAGE_PREFIX_DIR}/bin/qtk_gui") +set_and_check(Qtk_INCLUDE_DIR "${PACKAGE_PREFIX_DIR}/include") +set_and_check(Qtk_LIBRARIES "${PACKAGE_PREFIX_DIR}/lib") + check_required_components(Qtk)