MIRROR: javascript for 🐜's, a tiny runtime with big ambitions
cygwin cmake path fixes
+10
-4
+2
-2
.github/workflows/build-windows-x64.yml
+2
-2
.github/workflows/build-windows-x64.yml
···
68
68
restore-keys: subprojects-windows-x64-
69
69
- run: |
70
70
DEPS_CACHE=$(cygpath "${{ runner.temp }}/deps-cache")
71
+
DEPS_CACHE_WIN=$(cygpath -m "${{ runner.temp }}/deps-cache")
71
72
export PATH="/c/Users/$USER/.cargo/bin:$PATH"
72
73
export PKG_CONFIG_PATH="$DEPS_CACHE/lib/pkgconfig:$PKG_CONFIG_PATH"
73
-
export CMAKE_PREFIX_PATH="$DEPS_CACHE:$CMAKE_PREFIX_PATH"
74
-
meson setup build -Dc_std=gnu2x -Dbuild_timestamp=${{ inputs.build_timestamp }} && meson compile -C build
74
+
meson setup build -Dc_std=gnu2x -Dbuild_timestamp=${{ inputs.build_timestamp }} -Dcmake_prefix_path="$DEPS_CACHE_WIN" && meson compile -C build
75
75
- uses: actions/upload-artifact@v4
76
76
with:
77
77
name: ant-windows-x64
+7
-2
meson.build
+7
-2
meson.build
···
67
67
tlsuv_opts = cmake.subproject_options()
68
68
bdwgc_opts = cmake.subproject_options()
69
69
70
-
tlsuv_opts.add_cmake_defines({
70
+
cmake_prefix = get_option('cmake_prefix_path')
71
+
tlsuv_cmake_defines = {
71
72
'BUILD_TESTING': 'OFF',
72
73
'TLSUV_TLSLIB': tls_lib
73
-
})
74
+
}
75
+
if cmake_prefix != ''
76
+
tlsuv_cmake_defines += {'CMAKE_PREFIX_PATH': cmake_prefix}
77
+
endif
78
+
tlsuv_opts.add_cmake_defines(tlsuv_cmake_defines)
74
79
75
80
bdwgc_opts.add_cmake_defines({
76
81
'BUILD_SHARED_LIBS': 'OFF',
+1
meson_options.txt
+1
meson_options.txt
···
1
1
option('static_link', type: 'boolean', value: false, description: 'statically link the binary')
2
2
option('build_timestamp', type: 'string', value: '', description: 'build timestamp (defaults to current time if empty)')
3
3
option('tls_library', type: 'combo', choices: ['openssl', 'mbedtls'], value: 'openssl', description: 'TLS library to use')
4
+
option('cmake_prefix_path', type: 'string', value: '', description: 'CMAKE_PREFIX_PATH for cmake subprojects')