diff options
| -rw-r--r-- | .cmake.conf | 1 | ||||
| -rw-r--r-- | .prev_CMakeLists.txt | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | examples/oauth/redditclient/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | examples/oauth/twittertimeline/CMakeLists.txt | 6 |
5 files changed, 15 insertions, 4 deletions
diff --git a/.cmake.conf b/.cmake.conf new file mode 100644 index 0000000..9305480 --- /dev/null +++ b/.cmake.conf @@ -0,0 +1 @@ +set(QT_REPO_MODULE_VERSION "6.0.0") diff --git a/.prev_CMakeLists.txt b/.prev_CMakeLists.txt index 6f1f5c8..05aa282 100644 --- a/.prev_CMakeLists.txt +++ b/.prev_CMakeLists.txt @@ -2,8 +2,9 @@ cmake_minimum_required(VERSION 3.15.0) +include(.cmake.conf) project(QtNetworkAuth - VERSION 6.0.0 + VERSION "${QT_REPO_MODULE_VERSION}" DESCRIPTION "Qt NetworkAuth Libraries" HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C diff --git a/CMakeLists.txt b/CMakeLists.txt index 649c1dc..eae301f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,8 +2,9 @@ cmake_minimum_required(VERSION 3.15.0) +include(.cmake.conf) project(QtNetworkAuth - VERSION 6.0.0 + VERSION "${QT_REPO_MODULE_VERSION}" DESCRIPTION "Qt Network Auth Libraries" # special case HOMEPAGE_URL "https://qt.io/" LANGUAGES CXX C diff --git a/examples/oauth/redditclient/CMakeLists.txt b/examples/oauth/redditclient/CMakeLists.txt index 8afced5..4632105 100644 --- a/examples/oauth/redditclient/CMakeLists.txt +++ b/examples/oauth/redditclient/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/oauth/redditclient") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/oauth/redditclient") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/oauth/twittertimeline/CMakeLists.txt b/examples/oauth/twittertimeline/CMakeLists.txt index 053be1d..1efa737 100644 --- a/examples/oauth/twittertimeline/CMakeLists.txt +++ b/examples/oauth/twittertimeline/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/oauth/twittertimeline") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/oauth/twittertimeline") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Widgets) |