Module2

.github/workflows/reusable/cached-install/action.yml

@@ -6,18 +6,18 @@ runs:
   steps:
     - name: cache homedir
       id: cache-homedir
-      uses: actions/cache@v4
+      uses: actions/cache/restore@v4
       with:
         key: cache-homedir-${{ hashFiles('./vcpkg.json') }}
         path: |
-          ~/.cache
+          ~/.cache/vcpkg/archives
     - name: cache vcpkg installed
       id: cache-vcpkg-installed
-      uses: actions/cache@v4
+      uses: actions/cache/restore@v4
       with:
         key: cache-vcpkg-installed-${{ hashFiles('./vcpkg.json') }}
         path: |
-          **/vcpkg_installed
+          ./build/vcpkg_installed
     - name: install-prerequisities
       run:
         source install-prerequisities.sh
@@ -26,3 +26,20 @@ runs:
       run:
         ./install.sh
       shell: bash
+    - name: cache homedir save
+      id: cache-homedir-save
+      if: always()
+      uses: actions/cache/save@v4
+      with:
+        key: cache-homedir-${{ hashFiles('./vcpkg.json') }}
+        path: |
+          ~/.cache/vcpkg/archives
+    - name: cache vcpkg installed save
+      id: cache-vcpkg-installed-save
+      if: always()
+      uses: actions/cache/save@v4
+      with:
+        key: cache-vcpkg-installed-${{ hashFiles('./vcpkg.json') }}
+        path: |
+          ./build/vcpkg_installed
+

.gitignore

@@ -3,3 +3,4 @@ vcpkg_installed
 .vscode
 .trunk
 setenvs.sh
+*.DS_Store*

CMakeLists.txt

@@ -1,4 +1,11 @@
 cmake_minimum_required(VERSION 3.22)
+set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
+
+set(VCPKG_MANIFEST_INSTALL OFF)
+set(VCPKG_INSTALLED_DIR ${CMAKE_CURRENT_SOURCE_DIR}/build/vcpkg_installed)
+
+
+set (VCPKG_OVERLAY_TRIPLETS ENV{VCPKG_OVERLAY_TRIPLETS})
 set(CMAKE_CXX_STANDARD 26)
 include(homebrewClang.cmake)
 

clean.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+rm -rf ~/.cache/vcpkg
+
 # Parse MonorepoPackages.cmake and loop through them
 for package in $(cat MonorepoPackages.cmake | grep -v "set(MonorepoPackages" | grep -v ")"); do
     cd packages/$package/build && ls -A | while read FILE; do echo "\"$FILE\""; done | grep -v ".gitignore" | xargs rm -rf && cd ../../..

homebrewClang.cmake

@@ -1,7 +1,7 @@
 if (${APPLE})
     set(HOMEBREW_PREFIX $ENV{HOMEBREW_PREFIX})
 
-    set(LLVM_PREFIX "${HOMEBREW_PREFIX}/opt/llvm")
+    set(LLVM_PREFIX "${HOMEBREW_PREFIX}")
     set(CMAKE_C_COMPILER "${LLVM_PREFIX}/bin/clang")
     set(CMAKE_CXX_COMPILER "${LLVM_PREFIX}/bin/clang++")
     set(ENV{CC} "${CMAKE_C_COMPILER}")
@@ -20,7 +20,7 @@ if (${APPLE})
     set(CMAKE_FIND_FRAMEWORK LAST)
     set(CMAKE_FIND_APPBUNDLE LAST)
 
-    add_link_options("-L/opt/homebrew/opt/llvm/lib/c++" "-Wl,-rpath,/opt/homebrew/opt/llvm/lib/c++")
+    add_link_options("-L/opt/homebrew/lib/c++" "-Wl,-rpath,/opt/homebrew/lib/c++")
     #set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH FALSE)
     #set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH FALSE)
 endif()

install-prerequisities.sh

@@ -13,16 +13,19 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 
     xcode-select --install
     brew install jq
-    brew install llvm
+    brew uninstall llvm
+    brew install llvm@17
     brew install cmake
     brew install pkg-config
 
-    rm -f $HOMEBREW_PREFIX/bin/clang-format
-    rm -f $HOMEBREW_PREFIX/bin/clangd
-    rm -f $HOMEBREW_PREFIX/bin/lldb
-    ln -s $HOMEBREW_PREFIX/opt/llvm/bin/clang-format $HOMEBREW_PREFIX/bin/clang-format
-    ln -s $HOMEBREW_PREFIX/opt/llvm/bin/clangd $HOMEBREW_PREFIX/bin/clangd
-    ln -s $HOMEBREW_PREFIX/opt/llvm/bin/lldb $HOMEBREW_PREFIX/bin/lldb
+    brew link --overwrite --force llvm@17
+    #rm -f $HOMEBREW_PREFIX/bin/clang-format
+    #rm -f $HOMEBREW_PREFIX/bin/clangd
+    #rm -f $HOMEBREW_PREFIX/bin/lldb
+    #ln -s $HOMEBREW_PREFIX/bin/clang-format $HOMEBREW_PREFIX/bin/clang-format
+    #ln -s $HOMEBREW_PREFIX/bin/clangd $HOMEBREW_PREFIX/bin/clangd
+    #ln -s $HOMEBREW_PREFIX/bin/lldb $HOMEBREW_PREFIX/bin/lldb
+
     rm -f $HOMEBREW_PREFIX/bin/clang-tidy
 
 else
@@ -59,6 +62,16 @@ if [[ -n "$GITHUB_ENV" ]]; then
     echo "VCPKG_ROOT=$VCPKG_ROOT" >> $GITHUB_ENV
 fi
 
+export VCPKG_OVERLAY_TRIPLETS=$(pwd)/overlaytriplets
+if [[ -n "$GITHUB_ENV" ]]; then
+    echo "VCPKG_OVERLAY_TRIPLETS=$VCPKG_OVERLAY_TRIPLETS" >> $GITHUB_ENV
+fi
+
+export VCPKG_OVERLAY_PORTS=$(pwd)/overlayports
+if [[ -n "$GITHUB_ENV" ]]; then
+    echo "VCPKG_OVERLAY_PORTS=$VCPKG_OVERLAY_PORTS" >> $GITHUB_ENV
+fi
+
 if [[ ":$PATH:" != *":$VCPKG_ROOT:"* ]]; then
     export PATH=$PATH:$VCPKG_ROOT
     if [[ -n "$GITHUB_PATH" ]]; then
@@ -72,6 +85,12 @@ TEMP_PROFILE_CONTENTS+="export VCPKG_ROOT=$(pwd)/vcpkg\n"
 # Add PATH environment variable to include VCPKG_ROOT
 TEMP_PROFILE_CONTENTS+="export PATH=\$VCPKG_ROOT:\$PATH\n"
 
+# Add VCPKG_OVERLAY_TRIPLETS environment variable
+TEMP_PROFILE_CONTENTS+="export VCPKG_OVERLAY_TRIPLETS=$(pwd)/overlaytriplets\n"
+
+# Add VCPKG_OVERLAY_PORTS environment variable
+TEMP_PROFILE_CONTENTS+="export VCPKG_OVERLAY_PORTS=$(pwd)/overlayports\n"
+
 echo $TEMP_PROFILE_CONTENTS
 
 touch $PROFILE_FILE

install.sh

@@ -1,5 +1,19 @@
 #!/bin/bash
 
+set -e
+
+# Check if VCPKG_ROOT is set and points to the correct directory
+if [ -z "$VCPKG_ROOT" ]; then
+    echo "Error: VCPKG_ROOT is not set. Please run 'source install-prerequisities.sh' or 'source setenvs.sh' before running this script."
+    exit 1
+fi
+
+EXPECTED_VCPKG_ROOT="$(pwd)/vcpkg"
+if [ "$VCPKG_ROOT" != "$EXPECTED_VCPKG_ROOT" ]; then
+    echo "Error: VCPKG_ROOT points to the vcpkg of another project '$VCPKG_ROOT'. Please run 'source install-prerequisities.sh' or 'source setenvs.sh' before running this script."
+    exit 1
+fi
+
 # Parse command-line options
 PROD_BUILD=false
 
@@ -21,6 +35,8 @@ fi
 git config core.hooksPath .githooks
 ./merge-dependencies.sh
 
+vcpkg install --x-install-root=build/vcpkg_installed
+
 # Call build for all monorepo packages in their own build directories
 for package in $(cat MonorepoPackages.cmake | grep -v "set(MonorepoPackages" | grep -v ")"); do
     cd packages/$package/build && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && cmake --build . && cd ../../..
@@ -29,3 +45,4 @@ done
 # Call build for the root project
 echo "Building root project"
 cd build && cmake -DCMAKE_BUILD_TYPE=$BUILD_TYPE .. && cmake --build . && cd ..
+

lint.sh

@@ -2,7 +2,7 @@
 
 set -e
 
-FILES=$(find ./packages -type d \( -name src -o -name include -o -name test \) ! -path '*/build/*' -print0 | xargs -0 -I{} find {} -type f \( -name "*.hpp" -o -name "*.cpp" \) -print0 | xargs -0 echo)
+FILES=$(find ./packages -type d \( -name src -o -name include -o -name test \) ! -path '*/build/*' ! -path '*/proto/*' -print0 | xargs -0 -I{} find {} -type f \( -name "*.hpp" -o -name "*.cpp" \) -print0 | xargs -0 echo)
 echo "Running clangd-tidy on $FILES"
 
 ./clangd-tidy/clangd-tidy -p ./build $FILES

overlayports/magic-enum/portfile.cmake

@@ -0,0 +1,27 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Neargye/magic_enum
+    REF "v${VERSION}"
+    SHA512 fa3792e9c69c57e437d6325b7659cf25e6cbdda3326ffeaf0411d9838822095b15306f322ad2ebd5ec68b905ef2aed08880d2507e7d8a8559ab3c5be6c8ce99c
+    HEAD_REF master
+)
+
+set(VCPKG_BUILD_TYPE release) # header-only port
+
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DMAGIC_ENUM_OPT_BUILD_EXAMPLES=OFF
+        -DMAGIC_ENUM_OPT_BUILD_TESTS=OFF
+        -DMAGIC_ENUM_OPT_INSTALL=ON
+)
+
+vcpkg_cmake_install()
+
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/magic_enum PACKAGE_NAME magic_enum)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
+
+# Handle copyright
+configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

overlayports/magic-enum/usage

@@ -0,0 +1,4 @@
+magic-enum provides CMake targets:
+
+    find_package(magic_enum CONFIG REQUIRED)
+    target_link_libraries(main PRIVATE magic_enum::magic_enum)

overlayports/magic-enum/vcpkg.json

@@ -0,0 +1,17 @@
+{
+  "name": "magic-enum",
+  "version": "0.9.6",
+  "description": "Header-only C++17 library provides static reflection for enums, work with any enum type without any macro or boilerplate code.",
+  "homepage": "https://github.com/Neargye/magic_enum",
+  "license": "MIT",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
+}

overlaytriplets/arm64-ios.cmake

@@ -0,0 +1,20 @@
+set(VCPKG_TARGET_ARCHITECTURE arm64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+set(VCPKG_CMAKE_SYSTEM_NAME iOS)
+
+set(CMAKE_CXX_STANDARD 26)
+set(HOMEBREW_PREFIX $ENV{HOMEBREW_PREFIX})
+
+set(LLVM_PREFIX "${HOMEBREW_PREFIX}")
+set(CMAKE_C_COMPILER "${LLVM_PREFIX}/bin/clang")
+set(CMAKE_CXX_COMPILER "${LLVM_PREFIX}/bin/clang++")
+set(ENV{CC} "${CMAKE_C_COMPILER}")
+set(ENV{CXX} "${CMAKE_CXX_COMPILER}")
+
+set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DCMAKE_C_COMPILER=${LLVM_PREFIX}/bin/clang -DCMAKE_CXX_COMPILER=${LLVM_PREFIX}/bin/clang++ -DCMAKE_CXX_STANDARD=26 -DGFLAGS_INTTYPES_FORMAT=C99 -DBUILD_gflags_LIB=OFF -DBUILD_gflags_nothreads_LIB=ON)
+
+set(VCPKG_CXX_FLAGS "-isystem /opt/homebrew/include/c++/v1")
+set(VCPKG_C_FLAGS "-isystem /opt/homebrew/include/c++/v1")
+set(VCPKG_LINKER_FLAGS "-L/opt/homebrew/lib/c++ -Wl,-rpath,/opt/homebrew/lib/c++")
+

overlaytriplets/arm64-osx.cmake

@@ -0,0 +1,23 @@
+set(VCPKG_TARGET_ARCHITECTURE arm64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
+set(VCPKG_OSX_ARCHITECTURES arm64)
+
+set(CMAKE_CXX_STANDARD 26)
+set(HOMEBREW_PREFIX $ENV{HOMEBREW_PREFIX})
+
+set(LLVM_PREFIX "${HOMEBREW_PREFIX}")
+set(CMAKE_C_COMPILER "${LLVM_PREFIX}/bin/clang")
+set(CMAKE_CXX_COMPILER "${LLVM_PREFIX}/bin/clang++")
+set(ENV{CC} "${CMAKE_C_COMPILER}")
+set(ENV{CXX} "${CMAKE_CXX_COMPILER}")
+
+set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DCMAKE_C_COMPILER=${LLVM_PREFIX}/bin/clang -DCMAKE_CXX_COMPILER=${LLVM_PREFIX}/bin/clang++ -DCMAKE_CXX_STANDARD=26)
+
+set(VCPKG_CXX_FLAGS "-isystem /opt/homebrew/include/c++/v1")
+set(VCPKG_C_FLAGS "-isystem /opt/homebrew/include/c++/v1")
+set(VCPKG_LINKER_FLAGS "-L/opt/homebrew/lib/c++ -Wl,-rpath,/opt/homebrew/lib/c++")
+
+message(STATUS "OVERLAY TRIPLET arm64-osx loaded")

overlaytriplets/x64-linux.cmake

@@ -0,0 +1,12 @@
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+set(VCPKG_CMAKE_SYSTEM_NAME Linux)
+
+if(${PORT} MATCHES "folly")
+    message(STATUS "Port name is folly, setting build type to release")
+    set(VCPKG_BUILD_TYPE release)
+endif()
+
+message(STATUS "OVERLAY TRIPLET x64-linux loaded")

overlaytriplets/x64-osx.cmake

@@ -0,0 +1,23 @@
+set(VCPKG_TARGET_ARCHITECTURE x64)
+set(VCPKG_CRT_LINKAGE dynamic)
+set(VCPKG_LIBRARY_LINKAGE static)
+
+set(VCPKG_CMAKE_SYSTEM_NAME Darwin)
+set(VCPKG_OSX_ARCHITECTURES x86_64)
+
+set(CMAKE_CXX_STANDARD 26)
+set(HOMEBREW_PREFIX $ENV{HOMEBREW_PREFIX})
+
+set(LLVM_PREFIX "${HOMEBREW_PREFIX}")
+set(CMAKE_C_COMPILER "${LLVM_PREFIX}/bin/clang")
+set(CMAKE_CXX_COMPILER "${LLVM_PREFIX}/bin/clang++")
+set(ENV{CC} "${CMAKE_C_COMPILER}")
+set(ENV{CXX} "${CMAKE_CXX_COMPILER}")
+
+set(VCPKG_CMAKE_CONFIGURE_OPTIONS -DCMAKE_C_COMPILER=${LLVM_PREFIX}/bin/clang -DCMAKE_CXX_COMPILER=${LLVM_PREFIX}/bin/clang++ -DCMAKE_CXX_STANDARD=26)
+
+set(VCPKG_CXX_FLAGS "-isystem /opt/homebrew/include/c++/v1")
+set(VCPKG_C_FLAGS "-isystem /opt/homebrew/include/c++/v1")
+set(VCPKG_LINKER_FLAGS "-L/opt/homebrew/lib/c++ -Wl,-rpath,/opt/homebrew/lib/c++")
+
+message(STATUS "OVERLAY TRIPLET x64-osx loaded")

packages/streamr-eventemitter/homebrewClang.cmake

@@ -1,7 +1,7 @@
 if (${APPLE})
     set(HOMEBREW_PREFIX $ENV{HOMEBREW_PREFIX})
 
-    set(LLVM_PREFIX "${HOMEBREW_PREFIX}/opt/llvm")
+    set(LLVM_PREFIX "${HOMEBREW_PREFIX}")
     set(CMAKE_C_COMPILER "${LLVM_PREFIX}/bin/clang")
     set(CMAKE_CXX_COMPILER "${LLVM_PREFIX}/bin/clang++")
     set(ENV{CC} "${CMAKE_C_COMPILER}")
@@ -20,7 +20,7 @@ if (${APPLE})
     set(CMAKE_FIND_FRAMEWORK LAST)
     set(CMAKE_FIND_APPBUNDLE LAST)
 
-    add_link_options("-L/opt/homebrew/opt/llvm/lib/c++" "-Wl,-rpath,/opt/homebrew/opt/llvm/lib/c++")
+    add_link_options("-L/opt/homebrew/lib/c++" "-Wl,-rpath,/opt/homebrew/lib/c++")
     #set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH FALSE)
     #set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH FALSE)
 endif()

packages/streamr-eventemitter/include/streamr-eventemitter/EventEmitter.hpp

@@ -51,12 +51,11 @@ struct Event {
 };
 
 template <typename T, typename EmitterEventType>
-concept MatchingEventType = std::is_same<T, EmitterEventType>::value;
+concept MatchingEventType = std::is_same_v<T, EmitterEventType>;
 
 template <typename T, typename EmitterEventType>
-concept MatchingCallbackType =
-    std::is_assignable<typename EmitterEventType::Handler::HandlerFunction, T>::
-        value;
+concept MatchingCallbackType = std::
+    is_assignable_v<typename EmitterEventType::Handler::HandlerFunction, T>;
 
 // Immutable reference to a Handler.
 // This is needed because there is no way of checking the validity

packages/streamr-eventemitter/monorepoPackage.cmake

@@ -1,7 +1,14 @@
+set(CMAKE_POLICY_DEFAULT_CMP0077 NEW)
 
 if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../../MonorepoPackages.cmake)
     message(STATUS "In monorepo sub-package ${CMAKE_CURRENT_SOURCE_DIR}")
-
+
+    # if in monorepo, do not install vcpkg dependencies
+    set(VCPKG_MANIFEST_INSTALL OFF)
+
+    # if in monorepo, use the vcpkg dependencies from the monorepo root
+    set(VCPKG_INSTALLED_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../build/vcpkg_installed)
+
     # if in monorepo, use the monorepo deps from filesystem
     if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg.json)
       file(READ ${CMAKE_CURRENT_SOURCE_DIR}/vcpkg.json VCPKG_JSON)