Skip to content

[embree2] Fix static linking #18985

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 5 commits into from
Jul 20, 2021
Merged

[embree2] Fix static linking #18985

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
abe8ccf
[embree2] Fix static linking
BillyONeal Jul 17, 2021
f9f78f0
Disable embree2 more directly for mac and linux because the portfile …
BillyONeal Jul 19, 2021
f561638
Small changes
PhoebeHui Jul 20, 2021
b039ce9
Update the baseline version
PhoebeHui Jul 20, 2021
f9adcdd
Use string(COMPARE EQUAL for EMBREE_STATIC_RUNTIME as well.
BillyONeal Jul 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions ports/embree2/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,19 @@ vcpkg_from_github(
cmake_policy.patch
)

file(REMOVE ${SOURCE_PATH}/common/cmake/FindTBB.cmake)
file(REMOVE "${SOURCE_PATH}/common/cmake/FindTBB.cmake")

if(VCPKG_CRT_LINKAGE STREQUAL static)
set(EMBREE_STATIC_RUNTIME ON)
else()
set(EMBREE_STATIC_RUNTIME OFF)
endif()
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" EMBREE_STATIC_LIB)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" EMBREE_STATIC_RUNTIME)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
SOURCE_PATH "${SOURCE_PATH}"
DISABLE_PARALLEL_CONFIGURE
PREFER_NINJA # Disable this option if project cannot be built with Ninja
PREFER_NINJA
OPTIONS
-DEMBREE_ISPC_SUPPORT=OFF
-DEMBREE_TUTORIALS=OFF
-DEMBREE_STATIC_LIB=${EMBREE_STATIC_LIB}
-DEMBREE_STATIC_RUNTIME=${EMBREE_STATIC_RUNTIME}
"-DTBB_LIBRARIES=TBB::tbb"
"-DTBB_INCLUDE_DIRS=${CURRENT_INSTALLED_DIR}/include"
Expand All @@ -34,19 +32,21 @@ vcpkg_install_cmake()
vcpkg_copy_pdbs()

# these cmake files do not seem to contain helpful configuration for find libs, just remove them
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/embree-config.cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/embree-config-version.cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/embree-config.cmake)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/embree-config-version.cmake)

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/models)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/models)

file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/embree2)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/doc ${CURRENT_PACKAGES_DIR}/share/embree2/doc)

# Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/embree2)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/embree2/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/embree2/copyright)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/embree-config.cmake")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/embree-config-version.cmake")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/embree-config.cmake")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/embree-config-version.cmake")

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/models")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/models")

if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()

file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/share/embree2")
file(RENAME "${CURRENT_PACKAGES_DIR}/share/doc" "${CURRENT_PACKAGES_DIR}/share/embree2/doc")

file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
3 changes: 2 additions & 1 deletion ports/embree2/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
{
"name": "embree2",
"version-semver": "2.17.7",
"port-version": 1,
"port-version": 2,
"description": "High Performance Ray Tracing Kernels.",
"homepage": "https://github.com/embree/embree",
"supports": "windows",
"dependencies": [
"tbb"
]
Expand Down
4 changes: 0 additions & 4 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,6 @@ ecsutil:x64-osx=fail
ecsutil:x64-uwp=fail
# Checks for gnu extension so only works with gcc.
elfutils:x64-osx=fail
embree2:x64-linux=fail
embree2:x64-osx=fail
embree2:x64-windows-static=fail
embree2:x64-windows-static-md=fail
enet:arm-uwp=fail
enet:x64-uwp=fail
epsilon:arm-uwp=fail
Expand Down
10 changes: 5 additions & 5 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1862,7 +1862,7 @@
},
"embree2": {
"baseline": "2.17.7",
"port-version": 1
"port-version": 2
},
"embree3": {
"baseline": "3.12.2",
Expand Down Expand Up @@ -3120,14 +3120,14 @@
"baseline": "0.6.0-1",
"port-version": 0
},
"libebur128": {
"baseline": "1.2.6",
"port-version": 0
},
"libe57": {
"baseline": "1.1.312",
"port-version": 0
},
"libebur128": {
"baseline": "1.2.6",
"port-version": 0
},
"libepoxy": {
"baseline": "1.5.5",
"port-version": 0
Expand Down
5 changes: 5 additions & 0 deletions versions/e-/embree2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cc259bcc8185631761c55b23d95afba48e8bae70",
"version-semver": "2.17.7",
"port-version": 2
},
{
"git-tree": "234d3da49438399d5df9e1a105401bc930ae22fe",
"version-semver": "2.17.7",
Expand Down