Skip to content

Commit

Permalink
Trying to fix vcpkg build on GH Actions.
Browse files Browse the repository at this point in the history
  • Loading branch information
DragonJoker committed Apr 10, 2023
1 parent 470de5f commit f06f777
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 11 deletions.
12 changes: 12 additions & 0 deletions data/vcpkg/ports/vkfft/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# header-only library
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO DTolm/VkFFT
REF e1c58868a9581725dd595975daf780da0a37dad1 #v1.2.31
SHA512 b113f0117336ef2f6a285166cb4d68ea372e0dbb46025b7fcbae30f4f5147ad0fb1f7abfd91e1a73e2b4d72446c16ac0e90efc467785e035f176e81d95979706
HEAD_REF master
)

file(COPY "${SOURCE_PATH}/vkFFT/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/VkFFT")

file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
7 changes: 7 additions & 0 deletions data/vcpkg/ports/vkfft/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "vkfft",
"version": "1.2.31",
"description": "Vulkan/CUDA/HIP/OpenCL/Level Zero Fast Fourier Transform library",
"homepage": "https://github.com/DTolm/VkFFT",
"license": "MIT"
}
2 changes: 1 addition & 1 deletion external/vcpkg
Submodule vcpkg updated 96 files
+2 −2 ports/amd-amf/portfile.cmake
+1 −1 ports/amd-amf/vcpkg.json
+12 −6 ports/ashes/portfile.cmake
+18 −3 ports/ashes/vcpkg.json
+19 −0 ports/backward-cpp/portfile.cmake
+17 −0 ports/backward-cpp/vcpkg.json
+1 −2 ports/dartsim/vcpkg.json
+1 −1 ports/g3log/portfile.cmake
+1 −0 ports/g3log/vcpkg.json
+5 −12 ports/halide/portfile.cmake
+1 −2 ports/halide/vcpkg.json
+24 −0 ports/highs/fix-cmake-output.patch
+21 −0 ports/highs/fix-hconfig-path.patch
+13 −0 ports/highs/fix-threads.patch
+25 −0 ports/highs/portfile.cmake
+4 −0 ports/highs/usage
+18 −0 ports/highs/vcpkg.json
+2 −2 ports/libatomic-ops/portfile.cmake
+2 −3 ports/libatomic-ops/vcpkg.json
+3 −0 ports/libkml/portfile.cmake
+1 −1 ports/libkml/vcpkg.json
+4 −4 ports/libphonenumber/portfile.cmake
+1 −1 ports/libphonenumber/vcpkg.json
+2 −2 ports/libzen/portfile.cmake
+2 −2 ports/libzen/vcpkg.json
+37 −0 ports/llvm/0012-disable-libomp-aliases.patch
+2 −0 ports/llvm/portfile.cmake
+1 −0 ports/llvm/vcpkg.json
+2 −2 ports/luabridge3/portfile.cmake
+1 −1 ports/luabridge3/vcpkg.json
+0 −63 ports/mesa/clover.patch
+0 −3,571 ports/mesa/def-fixes.patch
+3 −16 ports/mesa/portfile.cmake
+1 −2 ports/mesa/vcpkg.json
+2 −2 ports/miniaudio/portfile.cmake
+1 −1 ports/miniaudio/vcpkg.json
+34 −34 ports/ngspice/Fix-C2065.patch
+6 −5 ports/ngspice/portfile.cmake
+1 −1 ports/ngspice/vcpkg.json
+14 −0 ports/onnxruntime-gpu/portfile.cmake
+1 −0 ports/onnxruntime-gpu/vcpkg.json
+25 −0 ports/qcustomplot/config.patch
+20 −26 ports/qcustomplot/portfile.cmake
+9 −3 ports/qcustomplot/vcpkg.json
+4 −3 ports/rendergraph/portfile.cmake
+1 −1 ports/rendergraph/vcpkg.json
+16 −4 ports/rocksdb/portfile.cmake
+1 −1 ports/rocksdb/vcpkg.json
+0 −18 ports/rtabmap/0003-fix-qt.patch
+0 −152 ports/rtabmap/cpp17.patch
+0 −27 ports/rtabmap/fix-CMake-export.patch
+15 −0 ports/rtabmap/fix_autouic.patch
+20 −0 ports/rtabmap/fix_qt_deploy_plugins.patch
+60 −34 ports/rtabmap/portfile.cmake
+86 −5 ports/rtabmap/vcpkg.json
+7 −1 ports/simd/portfile.cmake
+1 −0 ports/simd/vcpkg.json
+5 −0 ports/sqlcipher/CMakeLists.txt
+4 −3 ports/sqlcipher/portfile.cmake
+4 −0 ports/sqlcipher/vcpkg.json
+1 −0 ports/sqlite3/portfile.cmake
+4 −1 ports/sqlite3/vcpkg.json
+43 −14 ports/yara/CMakeLists.txt
+13 −0 ports/yara/Disable-module-elf.patch
+15 −3 ports/yara/portfile.cmake
+17 −3 ports/yara/vcpkg.json
+1 −1 scripts/bootstrap.ps1
+5 −5 scripts/bootstrap.sh
+3 −0 scripts/ci.baseline.txt
+2 −2 scripts/cmake/vcpkg_acquire_msys.cmake
+5 −0 versions/a-/amd-amf.json
+5 −0 versions/a-/ashes.json
+9 −0 versions/b-/backward-cpp.json
+37 −29 versions/baseline.json
+5 −0 versions/d-/dartsim.json
+5 −0 versions/g-/g3log.json
+5 −0 versions/h-/halide.json
+9 −0 versions/h-/highs.json
+5 −0 versions/l-/libatomic-ops.json
+5 −0 versions/l-/libkml.json
+5 −0 versions/l-/libphonenumber.json
+5 −0 versions/l-/libzen.json
+5 −0 versions/l-/llvm.json
+5 −0 versions/l-/luabridge3.json
+5 −0 versions/m-/mesa.json
+5 −0 versions/m-/miniaudio.json
+5 −0 versions/n-/ngspice.json
+5 −0 versions/o-/onnxruntime-gpu.json
+5 −0 versions/q-/qcustomplot.json
+5 −0 versions/r-/rendergraph.json
+5 −0 versions/r-/rocksdb.json
+5 −0 versions/r-/rtabmap.json
+5 −0 versions/s-/simd.json
+5 −0 versions/s-/sqlcipher.json
+5 −0 versions/s-/sqlite3.json
+5 −0 versions/y-/yara.json
1 change: 1 addition & 0 deletions include/Core/CastorUtils/Config/BeginExternHeaderGuard.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ See LICENSE file in root folder
#pragma warning( disable: 4464 )
#pragma warning( disable: 4616 )
#pragma warning( disable: 4619 )
#pragma warning( disable: 4702 )
#pragma warning( disable: 4996 )
#pragma warning( disable: 5031 )
#pragma warning( disable: 5054 )
Expand Down
8 changes: 0 additions & 8 deletions source/Plugins/Importers/AssimpImporter/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,6 @@ if ( VCPKG_BUILD OR ( VCPKG_TOOLCHAIN AND NOT CASTOR_USE_SYSTEM_ASSIMP ) )
set( pugixml_DIR ${VCPKG_SHARE_DIR}/pugixml )
set( RapidJSON_DIR ${VCPKG_SHARE_DIR}/rapidjson )
set( utf8cpp_DIR ${VCPKG_SHARE_DIR}/utf8cpp )
find_package( irrlicht CONFIG QUIET )
find_package( polyclipping CONFIG QUIET )
find_package( minizip CONFIG QUIET )
find_package( kubazip CONFIG QUIET )
find_package( poly2tri CONFIG QUIET )
find_package( pugixml CONFIG QUIET )
find_package( RapidJSON CONFIG QUIET )
find_package( utf8cpp CONFIG QUIET )
if ( VCPKG_BUILD )
find_library( ZLIB_LIBRARY_DEBUG zlib PATHS ${_VCPKG_INSTALLED_DIR}/debug/lib )
find_library( ZLIB_LIBRARY_RELEASE zlib PATHS ${_VCPKG_INSTALLED_DIR}/lib )
Expand Down
5 changes: 3 additions & 2 deletions vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
"name": "castor3d",
"version": "0.15.0",
"builtin-baseline": "648fd374b2e1d8507def23793c8af0cfa89fd0bb",
"builtin-baseline": "6accd15d644e93cec849ea346a147828437928b3",
"dependencies": [
"convectionkernels",
"freetype",
Expand All @@ -20,8 +20,9 @@
"vcpkg-configuration": {
"overlay-ports": [
"./data/vcpkg/ports/ashes",
"./data/vcpkg/ports/rendergraph",
"./data/vcpkg/ports/shaderwriter",
"./data/vcpkg/ports/rendergraph"
"./data/vcpkg/ports/vkfft"
]
},
"features": {
Expand Down

0 comments on commit f06f777

Please sign in to comment.