From f2a57d5b710b6df2efc6aab8306fe421bf2566f2 Mon Sep 17 00:00:00 2001 From: Eric Wasylishen Date: Sun, 10 Apr 2016 15:49:01 -0600 Subject: [PATCH] build: remove remaining embree stuff --- appveyor.yml | 5 +---- light/CMakeLists.txt | 14 -------------- 2 files changed, 1 insertion(+), 18 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f592f163..010eafc6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,4 @@ version: 1.0.{build} -install: -- ps: Invoke-WebRequest 'https://github.com/embree/embree/releases/download/v2.9.0/embree-2.9.0.win32.windows.zip' -OutFile 'embree.zip' -- ps: 7z x embree.zip -oc:\ build_script: - ps: >- $env:Path += ";C:\cygwin64\bin" @@ -10,7 +7,7 @@ build_script: cd cmakebuild - cmake .. -Dembree_DIR="c:\embree-2.9.0.win32.windows\lib\cmake\embree-2.9.0" + cmake .. msbuild PACKAGE.vcxproj /p:Configuration=Release /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" artifacts: diff --git a/light/CMakeLists.txt b/light/CMakeLists.txt index aa6eebd0..312023a7 100644 --- a/light/CMakeLists.txt +++ b/light/CMakeLists.txt @@ -25,18 +25,4 @@ target_link_libraries (light ${CMAKE_THREAD_LIBS_INIT}) set_property(TARGET light PROPERTY CXX_STANDARD 11) set_property(TARGET light PROPERTY CXX_STANDARD_REQUIRED ON) -if(WIN32) - file(GLOB EMBREE_DLLS "${embree_DIR}/../../*.dll") - foreach(EMBREE_DLL ${EMBREE_DLLS}) - add_custom_command(TARGET light POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${EMBREE_DLL} $) - endforeach(EMBREE_DLL) - - set(EMBREE_LICENSE "${embree_DIR}/../../../doc/LICENSE.txt") - add_custom_command(TARGET light POST_BUILD COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different ${EMBREE_LICENSE} $/LICENSE-embree.txt) -endif() - install(TARGETS light RUNTIME DESTINATION bin) -if(WIN32) - install(FILES ${EMBREE_DLLS} DESTINATION bin) - install(FILES LICENSE-embree.txt DESTINATION bin) -endif() \ No newline at end of file