From b3f9e3230e2da2dcf75fc6efcb15541d8df10dcd Mon Sep 17 00:00:00 2001
From: Shaun Reed <shaunrd0@gmail.com>
Date: Sun, 9 Apr 2023 21:44:27 -0400
Subject: [PATCH] clean up

---
 CMakeLists.txt     | 11 +++--------
 src/CMakeLists.txt |  4 ++--
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 733e7ee..df110be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -67,7 +67,7 @@ option(
     OFF
 )
 
-if(QTK_DEBUG OR CMAKE_BUILD_TYPE MATCHES "[Dd][Ee][Bb][Uu][Gg]")
+if(QTK_DEBUG OR CMAKE_BUILD_TYPE MATCHES "^[Dd][Ee][Bb][Uu][Gg]$")
   set(QTK_DEBUG ON)
   set(CMAKE_BUILD_TYPE Debug)
 else()
@@ -111,12 +111,6 @@ if(NOT Qt6_FOUND)
   )
 endif()
 
-# TODO: This might be a bit strange and needs more testing.
-if (QTK_PREFIX_QTCREATOR)
-  set(CMAKE_INSTALL_PREFIX  "${QT_INSTALL_DIR}")
-endif()
-
-
 #
 # To use custom plugins, set QT_PLUGIN_PATH environment variable before running designer
 # Or, we can install plugins to the designer for use across all projects.
@@ -137,8 +131,9 @@ set(
 set(
   VAR_PATHS
    CMAKE_PREFIX_PATH CMAKE_INSTALL_PREFIX QTK_PLUGIN_INSTALL_DIR QT6_INSTALL_PREFIX
-   QT_INSTALL_DIR QT6_INSTALL_PLUGINS
+   QT_INSTALL_DIR
 )
+list(APPEND VAR_NAMES QT6_INSTALL_PLUGINS)
 
 # Find Assimp.
 if(QTK_SUBMODULES)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e8be9d0..29e4e48 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -32,7 +32,7 @@ install(
     FILE_SET HEADERS DESTINATION include
     INCLUDES DESTINATION include
     LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib/static
+    ARCHIVE DESTINATION lib
     RUNTIME DESTINATION bin
 )
 
@@ -57,7 +57,7 @@ if(QTK_GUI)
       COMPONENT qtk_gui
       BUNDLE DESTINATION .
       LIBRARY DESTINATION lib
-      ARCHIVE DESTINATION lib/static
+      ARCHIVE DESTINATION lib
       RUNTIME DESTINATION bin
   )