re-cmake 1.8.0

Author: ypujante

build.gradle.kts

@@ -6,7 +6,7 @@ plugins {
 }
 
 group = "org.pongasoft"
-version = "1.6.1"
+version = "1.7.0"
 
 repositories {
     mavenCentral()
@@ -15,7 +15,7 @@ repositories {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlinx:kotlinx-html:0.7.2")
+    implementation("org.jetbrains.kotlinx:kotlinx-html:0.8.1")
 }
 
 buildConfig {

src/main/kotlin/RackExtension.kt

@@ -175,8 +175,8 @@ class RackExtension(val info: Info) {
           newTokens.getOrPut(key, {value})
         }
 
-        // using SDK version 4.5.0
-        setToken("re_sdk_version", "4.5.0")
+        // using SDK version 4.6.0
+        setToken("re_sdk_version", "4.6.0")
 
         // CMakeLists.txt
         setToken("cmake_project_name", info.productId.split(".").lastOrNull()?: "Blank")

src/main/resources/index.html

@@ -50,6 +50,6 @@ <h3>Step 4. Download the plugin</h3>
 
 </div>
 <script type="text/javascript" src="js/jszip.min.js"></script>
-<script type="text/javascript" src="re-quickstart-1.6.1.js"></script>
+<script type="text/javascript" src="re-quickstart-1.7.0.js"></script>
 </body>
 </html>

src/plugin/resources/skeletons/common/cmake/options.cmake

@@ -3,10 +3,10 @@ cmake_minimum_required(VERSION 3.24)
 #################
 # re-cmake
 #################
-set(re-cmake_GIT_TAG "v1.7.3" CACHE STRING "re-cmake git tag")
+set(re-cmake_GIT_TAG "v1.8.0" CACHE STRING "re-cmake git tag")
 set(re-cmake_GIT_REPO "https://github.com/pongasoft/re-cmake" CACHE STRING "re-cmake git repository url")
 set(re-cmake_DOWNLOAD_URL "${re-cmake_GIT_REPO}/archive/refs/tags/${re-cmake_GIT_TAG}.zip" CACHE STRING "re-cmake download url" FORCE)
-set(re-cmake_DOWNLOAD_URL_HASH "SHA256=4d77121d90130e52103358fd556b02fcbfc52730d0b4362f98cca32d849abb30" CACHE STRING "re-cmake download url hash" FORCE)
+set(re-cmake_DOWNLOAD_URL_HASH "SHA256=1848dfcb531f2a139c6b74c456d3bd94483cb7f59cd19efdc04b29bf45f1ef1f" CACHE STRING "re-cmake download url hash" FORCE)
 
 # Uncomment/set to proper value if local instead of remote
 set(re-cmake_ROOT_DIR "") # use remote re-cmake

src/plugin/resources/skeletons/common/cmake/re-cmake.cmake

@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.24)
 
 include(FetchContent)
 
+# Note that this function only fetches the content and does NOT make it available
 function(fetch_content)
   set(oneValueArgs NAME GIT_REPO GIT_TAG DOWNLOAD_URL DOWNLOAD_URL_HASH ROOT_DIR)
 
@@ -36,37 +37,36 @@ function(fetch_content)
 
   string(TOUPPER "${ARG_NAME}" UPPERCASE_NAME)
 
-  # if root dir is defined, fetch content will not use git
-  set(FETCHCONTENT_SOURCE_DIR_${UPPERCASE_NAME} ${ARG_ROOT_DIR})
-
-  if(ARG_DOWNLOAD_URL)
-    FetchContent_Declare(           ${ARG_NAME}
-        URL                        "${ARG_DOWNLOAD_URL}"
-        URL_HASH                   "${ARG_DOWNLOAD_URL_HASH}"
-        SOURCE_DIR                 "${CMAKE_CURRENT_BINARY_DIR}/${ARG_NAME}-src"
-        BINARY_DIR                 "${CMAKE_CURRENT_BINARY_DIR}/${ARG_NAME}-build"
-        DOWNLOAD_EXTRACT_TIMESTAMP true
-        )
-    set(FETCH_SOURCE "${ARG_DOWNLOAD_URL}")
-  else()
+  if(ARG_ROOT_DIR)
+    message(STATUS "Using ${ARG_NAME} from local ${ARG_ROOT_DIR}")
     FetchContent_Declare(${ARG_NAME}
-        GIT_REPOSITORY    ${ARG_GIT_REPO}
-        GIT_TAG           ${ARG_GIT_TAG}
-        GIT_CONFIG        advice.detachedHead=false
-        GIT_SHALLOW       true
-        SOURCE_DIR        "${CMAKE_CURRENT_BINARY_DIR}/${ARG_NAME}-src"
-        BINARY_DIR        "${CMAKE_CURRENT_BINARY_DIR}/${ARG_NAME}-build"
-        )
-    set(FETCH_SOURCE "${ARG_GIT_REPO}/tree/${ARG_GIT_TAG}")
-  endif()
-
-
-  FetchContent_GetProperties(${ARG_NAME})
-
-  if(FETCHCONTENT_SOURCE_DIR_${UPPERCASE_NAME})
-    message(STATUS "Using ${ARG_NAME} from local ${FETCHCONTENT_SOURCE_DIR_${UPPERCASE_NAME}}")
+        SOURCE_DIR       "${ARG_ROOT_DIR}"
+        BINARY_DIR       "${CMAKE_CURRENT_BINARY_DIR}/${ARG_NAME}-build"
+        SOURCE_SUBDIR    "do_not_make_available" # invalid folder to not execute CMakeLists.txt
+    )
   else()
-    message(STATUS "Fetching ${ARG_NAME} from ${FETCH_SOURCE}")
+    if(ARG_DOWNLOAD_URL)
+      message(STATUS "Fetching ${ARG_NAME} from ${ARG_DOWNLOAD_URL}")
+      FetchContent_Declare(          ${ARG_NAME}
+          URL                        "${ARG_DOWNLOAD_URL}"
+          URL_HASH                   "${ARG_DOWNLOAD_URL_HASH}"
+          SOURCE_DIR                 "${CMAKE_CURRENT_BINARY_DIR}/${ARG_NAME}-src"
+          BINARY_DIR                 "${CMAKE_CURRENT_BINARY_DIR}/${ARG_NAME}-build"
+          DOWNLOAD_EXTRACT_TIMESTAMP true
+          SOURCE_SUBDIR              "do_not_make_available"
+      )
+    else()
+      message(STATUS "Fetching ${ARG_NAME} from ${ARG_GIT_REPO}/tree/${ARG_GIT_TAG}")
+      FetchContent_Declare(${ARG_NAME}
+          GIT_REPOSITORY   ${ARG_GIT_REPO}
+          GIT_TAG          ${ARG_GIT_TAG}
+          GIT_CONFIG       advice.detachedHead=false
+          GIT_SHALLOW      true
+          SOURCE_DIR       "${CMAKE_CURRENT_BINARY_DIR}/${ARG_NAME}-src"
+          BINARY_DIR       "${CMAKE_CURRENT_BINARY_DIR}/${ARG_NAME}-build"
+          SOURCE_SUBDIR    "do_not_make_available"
+      )
+    endif()
   endif()
 
   FetchContent_MakeAvailable(${ARG_NAME})