olegpz
/
ericw-tools
mirror of https://github.com/ericwa/ericw-tools.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "ci: use older embree/tbb which support Win8.1" 

This reverts commit 50c4709d31.
This commit is contained in:
Eric Wasylishen 2022-11-13 16:52:14 -07:00
parent 50c4709d31
commit 99e5f15d42
6 changed files with 14 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,7 +1,7 @@
bin/
cmakebuild/
cmake-*/
*build*/
build*/
CMakeFiles/
*.xcodeproj
.vscode/**

5
appveyor.yml
View File

@ -4,6 +4,11 @@ platform:
- x64
version: 1.0.{build}
install:
- ps: Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v3.12.1/embree-3.12.1.x64.vc14.windows.zip' -OutFile 'embree64.zip'
- ps: 7z x embree64.zip -oc:\
- ps: Invoke-WebRequest 'https://github.com/oneapi-src/oneTBB/releases/download/v2020.2/tbb-2020.2-win.zip' -OutFile 'tbb.zip'
- ps: 7z x tbb.zip -oc:\
build_script:
- cmd: powershell .\build-appveyor.ps1
artifacts:

9
build-appveyor.ps1
View File

@ -1,10 +1,3 @@
# Download embree and tbb
# Seems like TBB dropped Windows 8.1 support in version 2020 so we'll use older versions
Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v3.9.0/embree-3.9.0.x64.vc14.windows.zip' -OutFile 'embree64.zip'
7z x embree64.zip -oc:\
Invoke-WebRequest 'https://github.com/oneapi-src/oneTBB/releases/download/2019_U9/tbb2019_20191006oss_win.zip' -OutFile 'tbb.zip'
7z x tbb.zip -oc:\
git submodule update --init --recursive
$env:Path += ";C:\cygwin64\bin"
@ -25,7 +18,7 @@ mkdir cmakebuild
cd cmakebuild
cmake .. -T v143 -Dembree_DIR="C:\embree-3.9.0.x64.vc14.windows" -DTBB_DIR="C:\tbb2019_20191006oss\cmake" -DCMAKE_GENERATOR_PLATFORM=x64 -DLEGACY_EMBREE=YES
cmake .. -T v143 -Dembree_DIR="C:\embree-3.12.1.x64.vc14.windows" -DTBB_DIR="C:\tbb\cmake" -DCMAKE_GENERATOR_PLATFORM=x64 -DENABLE_LIGHTPREVIEW=NO -DQt5Widgets_DIR="C:\Qt\5.8\msvc2013_64\lib\cmake\Qt5Widgets"
$cmakePlatform = "x64"

7
build-windows.ps1
View File

@ -1,8 +1,7 @@
# Download embree and tbb
# Seems like TBB dropped Windows 8.1 support in version 2020 so we'll use older versions
Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v3.9.0/embree-3.9.0.x64.vc14.windows.zip' -OutFile 'embree64.zip'
Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v3.12.1/embree-3.12.1.x64.vc14.windows.zip' -OutFile 'embree64.zip'
7z x embree64.zip -oc:\
Invoke-WebRequest 'https://github.com/oneapi-src/oneTBB/releases/download/2019_U9/tbb2019_20191006oss_win.zip' -OutFile 'tbb.zip'
Invoke-WebRequest 'https://github.com/oneapi-src/oneTBB/releases/download/v2020.2/tbb-2020.2-win.zip' -OutFile 'tbb.zip'
7z x tbb.zip -oc:\
git submodule update --init --recursive
@ -21,7 +20,7 @@ choco install ninja
mkdir build-windows
cd build-windows
cmake .. -GNinja -Dembree_DIR="C:\embree-3.9.0.x64.vc14.windows" -DTBB_DIR="C:\tbb2019_20191006oss\cmake" -DCMAKE_BUILD_TYPE=Release -DLEGACY_EMBREE=YES
cmake .. -GNinja -Dembree_DIR="C:\embree-3.12.1.x64.vc14.windows" -DTBB_DIR="C:\tbb\cmake" -DCMAKE_BUILD_TYPE=Release
ninja
if ( $? -eq $false ) {

23
light/CMakeLists.txt
View File

@ -45,12 +45,7 @@ add_executable(light main.cc)
target_link_libraries(light PRIVATE common liblight)
if (embree_FOUND)
if (LEGACY_EMBREE)
target_link_libraries (liblight PRIVATE ${EMBREE_LIBRARY})
else()
target_link_libraries (liblight PRIVATE embree)
endif()
target_link_libraries (liblight PRIVATE embree)
add_definitions(-DHAVE_EMBREE)
# macOS/homebrew: hack around find_file applying the .. before resolving the symlink
@ -79,19 +74,11 @@ if (embree_FOUND)
endif()
add_custom_command(TARGET light POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:embree>" "$<TARGET_FILE_DIR:light>"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:TBB::tbb>" "$<TARGET_FILE_DIR:light>"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:TBB::tbbmalloc>" "$<TARGET_FILE_DIR:light>"
)
if (LEGACY_EMBREE)
add_custom_command(TARGET light POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${embree_DIR}/bin/embree3.dll" "$<TARGET_FILE_DIR:light>")
else()
add_custom_command(TARGET light POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:embree>" "$<TARGET_FILE_DIR:light>")
endif()
if (NOT EMBREE_LICENSE STREQUAL EMBREE_LICENSE-NOTFOUND)
add_custom_command(TARGET light POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${EMBREE_LICENSE}" "$<TARGET_FILE_DIR:light>/LICENSE-embree.txt")
@ -107,11 +94,7 @@ if (embree_FOUND)
COMMAND bash ARGS -c \"install_name_tool -add_rpath @loader_path $<TARGET_FILE:light> || true\")
endif()
if (LEGACY_EMBREE)
install(FILES "${embree_DIR}/bin/embree3.dll" DESTINATION bin)
else()
install(FILES $<TARGET_FILE:embree> DESTINATION bin)
endif()
install(FILES $<TARGET_FILE:embree> DESTINATION bin)
# install TBB
if(UNIX)

10
tests/CMakeLists.txt
View File

@ -33,18 +33,10 @@ target_compile_definitions(tests PRIVATE DOCTEST_CONFIG_SUPER_FAST_ASSERTS)
# HACK: copy .dll dependencies
add_custom_command(TARGET tests POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:embree>" "$<TARGET_FILE_DIR:tests>"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:TBB::tbb>" "$<TARGET_FILE_DIR:tests>"
COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:TBB::tbbmalloc>" "$<TARGET_FILE_DIR:tests>"
)
if (LEGACY_EMBREE)
add_custom_command(TARGET tests POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${embree_DIR}/bin/embree3.dll" "$<TARGET_FILE_DIR:tests>")
else()
add_custom_command(TARGET tests POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:embree>" "$<TARGET_FILE_DIR:tests>")
endif()
if (NOT EMBREE_TBB_DLL STREQUAL EMBREE_TBB_DLL-NOTFOUND)
add_custom_command(TARGET tests POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${EMBREE_TBB_DLL}" "$<TARGET_FILE_DIR:tests>")