[Kf5testeditor] fix single config (microsoft#42726)

ParvusLacertus · Dec 16, 2024 · 948820b · 948820b
1 parent e1f8cf7
commit 948820b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/ports/kf5texteditor/portfile.cmake b/ports/kf5texteditor/portfile.cmake
@@ -17,13 +17,17 @@ if(VCPKG_TARGET_IS_WINDOWS)
     elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
         set(DATAROOT "share")
     endif()
-    file(COPY "${CURRENT_INSTALLED_DIR}/${DATAROOT}/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/data")
-    file(GLOB TEMP_DESKTOP_FILES_DBG "${CURRENT_PACKAGES_DIR}/debug/${DATAROOT}/kservicetypes5/*")
+    if(NOT VCPKG_BUILD_TYPE)
+        file(COPY "${CURRENT_INSTALLED_DIR}/${DATAROOT}/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/data")
+        file(GLOB TEMP_DESKTOP_FILES_DBG "${CURRENT_PACKAGES_DIR}/debug/${DATAROOT}/kservicetypes5/*")
+    endif()
     file(COPY "${CURRENT_INSTALLED_DIR}/${DATAROOT}/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/data")
     file(GLOB TEMP_DESKTOP_FILES_REL "${CURRENT_PACKAGES_DIR}/${DATAROOT}/kservicetypes5/*")
 else()
-    file(COPY "${CURRENT_INSTALLED_DIR}/share/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/share")
-    file(GLOB TEMP_DESKTOP_FILES_DBG "${CURRENT_PACKAGES_DIR}/debug/share/kservicetypes5/*")
+    if(NOT VCPKG_BUILD_TYPE)
+        file(COPY "${CURRENT_INSTALLED_DIR}/share/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/share")
+        file(GLOB TEMP_DESKTOP_FILES_DBG "${CURRENT_PACKAGES_DIR}/debug/share/kservicetypes5/*")
+    endif()
     file(COPY "${CURRENT_INSTALLED_DIR}/share/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/share")
     file(GLOB TEMP_DESKTOP_FILES_REL "${CURRENT_PACKAGES_DIR}/share/kservicetypes5/*")
 endif()

diff --git a/ports/kf5texteditor/vcpkg.json b/ports/kf5texteditor/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "kf5texteditor",
   "version": "5.98.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Full text editor component",
   "homepage": "https://api.kde.org/frameworks/ktexteditor/html/",
   "dependencies": [

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4106,7 +4106,7 @@
     },
     "kf5texteditor": {
       "baseline": "5.98.0",
-      "port-version": 1
+      "port-version": 2
     },
     "kf5textwidgets": {
       "baseline": "5.98.0",

diff --git a/versions/k-/kf5texteditor.json b/versions/k-/kf5texteditor.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6eaa991090763dab7139de8114bc2c715659ef35",
+      "version": "5.98.0",
+      "port-version": 2
+    },
     {
       "git-tree": "184ee77705278a5194c32d6f6d38ea3bc19b4fd2",
       "version": "5.98.0",