Merge branch 'change_build'

.github/workflows/colorer_ci.yml

@@ -133,9 +133,9 @@ jobs:
         zip: [ON, OFF]
         include:
           - arch: x64
-            triplet: x64-windows-static
+            triplet: x64-win-static-rel
           - arch: x86
-            triplet: x86-windows-static
+            triplet: x86-win-static-rel
         exclude:
           - arch: x86
             zip: OFF
@@ -182,7 +182,6 @@ jobs:
           -DCOLORER_BUILD_TEST=ON
           -DCOLORER_BUILD_ARCH=${{ matrix.arch }}
           -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake
-          -DVCPKG_OVERLAY_PORTS=$GITHUB_WORKSPACE/external/vcpkg-ports
           -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }}
           -DCOLORER_USE_ICU_STRINGS=${{ matrix.icu }}
           -DCOLORER_USE_ZIPINPUTSOURCE=${{ matrix.zip }}

.github/workflows/prebuild.yml

@@ -23,9 +23,9 @@ jobs:
         zip: [ON]
         include:
           - arch: x64
-            triplet: x64-windows-static
+            triplet: x64-win-static-rel
           - arch: x86
-            triplet: x86-windows-static
+            triplet: x86-win-static-rel
 
     name: windows-${{ matrix.arch }}
 
@@ -65,7 +65,6 @@ jobs:
           -DCOLORER_BUILD_TEST=OFF
           -DCOLORER_BUILD_ARCH=${{ matrix.arch }}
           -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake
-          -DVCPKG_OVERLAY_PORTS=$GITHUB_WORKSPACE/external/vcpkg-ports
           -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }}
           -DCOLORER_USE_ICU_STRINGS=${{ matrix.icu }}
           -DCOLORER_USE_ZIPINPUTSOURCE=${{ matrix.zip }}

.github/workflows/release.yml

@@ -64,9 +64,9 @@ jobs:
         arch: [ x64, x86 ]
         include:
           - arch: x64
-            triplet: x64-windows-static
+            triplet: x64-win-static-rel
           - arch: x86
-            triplet: x86-windows-static
+            triplet: x86-win-static-rel
 
     env:
       BUILD_TYPE: Release
@@ -110,7 +110,6 @@ jobs:
           -DCOLORER_BUILD_TEST=OFF
           -DCOLORER_BUILD_ARCH=${{ matrix.arch }}
           -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake
-          -DVCPKG_OVERLAY_PORTS=$GITHUB_WORKSPACE/external/vcpkg-ports
           -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }}
           -DVCPKG_FEATURE_FLAGS=manifests,versions
           -DCMAKE_INSTALL_PREFIX=./install/colorer

CMakeLists.txt

@@ -15,6 +15,13 @@ endif()
 include(cmake/colorer_extract_version.cmake)
 colorer_extract_version()
 
+#====================================================
+# vcpkg settings
+#====================================================
+# set before declare project(...)
+set(VCPKG_MANIFEST_DIR "${CMAKE_HOME_DIRECTORY}/vcpkg/manifest" CACHE STRING "Set the path to the manifest folder")
+message(STATUS "Using vcpkg manifest: ${VCPKG_MANIFEST_DIR}/vcpkg.json")
+
 #====================================================
 # main project
 #====================================================

CMakePresets.json

@@ -90,23 +90,23 @@
       "name": "vcpkg_win_x64",
       "inherits": "vcpkg",
       "cacheVariables": {
-        "VCPKG_TARGET_TRIPLET": "x64-windows-static"
+        "VCPKG_TARGET_TRIPLET": "x64-win-static"
       },
       "hidden": true
     },
     {
       "name": "vcpkg_win_x86",
       "inherits": "vcpkg",
       "cacheVariables": {
-        "VCPKG_TARGET_TRIPLET": "x86-windows-static"
+        "VCPKG_TARGET_TRIPLET": "x86-win-static"
       },
       "hidden": true
     },
     {
       "name": "vcpkg_win_arm64",
       "inherits": "vcpkg",
       "cacheVariables": {
-        "VCPKG_TARGET_TRIPLET": "arm64-windows-static"
+        "VCPKG_TARGET_TRIPLET": "arm64-win-static"
       },
       "hidden": true
     },

README.md

@@ -49,11 +49,11 @@ Build colorer and dependency, if they are not in the local cache:
 
 mkdir build
 cd build
-cmake -S .. -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=%VCPKG_ROOT%/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-windows-static -DCOLORER_BUILD_ARCH=x64
+cmake -S .. -G "NMake Makefiles" -DCMAKE_TOOLCHAIN_FILE=%VCPKG_ROOT%/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=x64-win-static -DCOLORER_BUILD_ARCH=x64
 cmake --build .
 ```
 
-For x86 platform use `-DVCPKG_TARGET_TRIPLET=x86-windows-static -DCOLORER_BUILD_ARCH=x86`, arm64 - `-DVCPKG_TARGET_TRIPLET=arm64-windows-static -DCOLORER_BUILD_ARCH=arm64`.
+For x86 platform use `-DVCPKG_TARGET_TRIPLET=x86-win-static -DCOLORER_BUILD_ARCH=x86`, arm64 - `-DVCPKG_TARGET_TRIPLET=arm64-win-static -DCOLORER_BUILD_ARCH=arm64`.
 
 Once built, the dependencies will be cached in the local cache.