chore: fetch QtCreator into version-specific directory

gikari · Dec 3, 2022 · 11730ce · 11730ce
1 parent 1092c56
commit 11730ce
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/external/qtcreator/CMakeLists.txt b/external/qtcreator/CMakeLists.txt
@@ -1,5 +1,7 @@
-### Download and install Qt Creator
-set(QTC_DIST_PATH "${PROJECT_SOURCE_DIR}/external/qtcreator/dist-${CMAKE_SYSTEM_NAME}")
+include("version.cmake")
+
+set(QTC_DIST_PATH
+    "${PROJECT_SOURCE_DIR}/external/qtcreator/dist-${CMAKE_SYSTEM_NAME}-${QT_CREATOR_VERSION}")
 if (NOT EXISTS "${QTC_DIST_PATH}")
     execute_process(COMMAND
         ${CMAKE_COMMAND} -P "${PROJECT_SOURCE_DIR}/tools/DownloadQtCreator.cmake"

diff --git a/external/qtcreator/version.cmake b/external/qtcreator/version.cmake
@@ -0,0 +1,2 @@
+set(QT_CREATOR_VERSION "4.15.2")
+set(QT_CREATOR_SNAPSHOT "")
diff --git a/tools/DownloadQtCreator.cmake b/tools/DownloadQtCreator.cmake
@@ -1,5 +1,7 @@
-set(QT_CREATOR_VERSION "4.15.2")
-set(QT_CREATOR_SNAPSHOT "")
+set(QTC_EXT_DIR "${CMAKE_CURRENT_LIST_DIR}/../external/qtcreator")
+
+# Fetch Qt Creator Version
+include("${QTC_EXT_DIR}/version.cmake")
 
 # Notify CI about Qt Creator version
 file(APPEND $ENV{GITHUB_OUTPUT} "qtc_ver=${QT_CREATOR_VERSION}")
@@ -22,7 +24,8 @@ elseif ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Darwin")
   set(qtc_platform "mac_x64")
 endif()
 
-set(QTC_DIST_DIR "${CMAKE_CURRENT_LIST_DIR}/../external/qtcreator/dist-${CMAKE_HOST_SYSTEM_NAME}")
+set(QTC_DIST_DIR "${QTC_EXT_DIR}/dist-${CMAKE_HOST_SYSTEM_NAME}-${QT_CREATOR_VERSION}")
+
 file(MAKE_DIRECTORY "${QTC_DIST_DIR}")
 
 message(STATUS "Downloading Qt Creator from ${qtc_base_url}/${qtc_platform}...")

diff --git a/tools/ci/Package.cmake b/tools/ci/Package.cmake
@@ -1,4 +1,5 @@
-set(QTC_DIR "${CMAKE_CURRENT_LIST_DIR}/../../external/qtcreator/dist-${CMAKE_HOST_SYSTEM_NAME}")
+set(QTC_EXT_DIR "${CMAKE_CURRENT_LIST_DIR}/../../external/qtcreator")
+set(QTC_DIR "${QTC_EXT_DIR}/dist-${CMAKE_HOST_SYSTEM_NAME}-$ENV{QT_CREATOR_VERSION}")
 
 set(build_plugin_py "scripts/build_plugin.py")
 foreach(dir "share/qtcreator/scripts" "Qt Creator.app/Contents/Resources/scripts" "Contents/Resources/scripts")