diff --git a/CMakeLists.txt b/CMakeLists.txt index 668799ab..c77fec78 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,10 +22,13 @@ set(Qt5Widgets_FIND_COMPONENTS Private CACHE STRING "force include private set(Qt5_DIR "C:/.conan/ea20b9/1/lib/cmake/Qt5") # TODO pass in externally find_package(Qt5 REQUIRED COMPONENTS Core Gui Opengl Quick Quickwidgets Svg Webengine WebengineCore Widgets) -message(STATUS "Qt5_VERSION : ${Qt5_VERSION}") -message(STATUS "Qt5_VERSION_MAJOR: ${Qt5_VERSION_MAJOR}") -message(STATUS "Qt5_VERSION_MINOR: ${Qt5_VERSION_MINOR}") -message(STATUS "Qt5_VERSION_PATCH: ${Qt5_VERSION_PATCH}") +# define install directories +set(QSK_INSTALL_DOCS doc) +set(QSK_INSTALL_HEADERS include) +set(QSK_INSTALL_LIBS lib) +set(QSK_INSTALL_BINS bin) +set(QSK_INSTALL_PLUGINS plugins) +set(QSK_INSTALL_EXAMPLES examples) add_subdirectory(src) add_subdirectory(skins) diff --git a/features/qskconfig.cmake b/features/qskconfig.cmake index 93c820f5..17ff525a 100644 --- a/features/qskconfig.cmake +++ b/features/qskconfig.cmake @@ -20,13 +20,6 @@ if("${QSK_INSTALL_PREFIX}" STREQUAL "") endif() endif() -set(QSK_INSTALL_DOCS doc) -set(QSK_INSTALL_HEADERS include) -set(QSK_INSTALL_LIBS lib) -set(QSK_INSTALL_BINS bin) -set(QSK_INSTALL_PLUGINS plugins) -set(QSK_INSTALL_EXAMPLES examples) - # TODO find compiler flag equivalent list(APPEND CONFIG no_private_qt_headers_warning) list(APPEND CONFIG warn_on)