mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-26 06:07:51 +08:00
c7a2f021f2
* Update embree to 3.11.0 * Update portfile.cmake Remove unused function include(vcpkg_common_functions) * Update ports/embree3/portfile.cmake Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
118 lines
5.1 KiB
Diff
Executable File
118 lines
5.1 KiB
Diff
Executable File
diff --git a/common/algorithms/CMakeLists.txt b/common/algorithms/CMakeLists.txt
|
|
index 5667d2bd3..cb26776a4 100644
|
|
--- a/common/algorithms/CMakeLists.txt
|
|
+++ b/common/algorithms/CMakeLists.txt
|
|
@@ -17,11 +17,4 @@ ADD_LIBRARY(algorithms OBJECT
|
|
SET_PROPERTY(TARGET algorithms PROPERTY FOLDER common)
|
|
SET_PROPERTY(TARGET algorithms APPEND PROPERTY COMPILE_FLAGS " ${FLAGS_LOWEST}")
|
|
|
|
-# ideally we would use target_link_libraries to provide the algorithms target
|
|
-# with the TBB include directory information. Howeve, this is only possible in
|
|
-# very recent versions of TBB and therefore we use the target property instead
|
|
-GET_TARGET_PROPERTY(tasking_include_dirs tasking INCLUDE_DIRECTORIES)
|
|
-if (tasking_include_dirs)
|
|
- TARGET_INCLUDE_DIRECTORIES(algorithms PUBLIC "${tasking_include_dirs}")
|
|
- GET_TARGET_PROPERTY(algorithms_include_dirs algorithms INCLUDE_DIRECTORIES)
|
|
-endif()
|
|
+TARGET_LINK_LIBRARIES(algorithms PUBLIC tasking)
|
|
diff --git a/common/cmake/embree-config.cmake b/common/cmake/embree-config.cmake
|
|
index 9b7370ccd..14ce929d6 100644
|
|
--- a/common/cmake/embree-config.cmake
|
|
+++ b/common/cmake/embree-config.cmake
|
|
@@ -5,8 +5,6 @@ SET(EMBREE_ROOT_DIR ${CMAKE_CURRENT_LIST_DIR}/@EMBREE_RELATIV_ROOT_DIR@)
|
|
GET_FILENAME_COMPONENT(EMBREE_ROOT_DIR "${EMBREE_ROOT_DIR}" ABSOLUTE)
|
|
|
|
SET(EMBREE_INCLUDE_DIRS ${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_INCLUDEDIR@)
|
|
-SET(EMBREE_LIBRARY ${EMBREE_ROOT_DIR}/@CMAKE_INSTALL_LIBDIR@/@EMBREE_LIBRARY_FULLNAME@)
|
|
-SET(EMBREE_LIBRARIES ${EMBREE_LIBRARY})
|
|
|
|
SET(EMBREE_VERSION @EMBREE_VERSION@)
|
|
SET(EMBREE_VERSION_MAJOR @EMBREE_VERSION_MAJOR@)
|
|
@@ -22,7 +20,6 @@ SET(EMBREE_ISA_AVX2 @EMBREE_ISA_AVX2@)
|
|
SET(EMBREE_ISA_AVX512KNL @EMBREE_ISA_AVX512KNL@)
|
|
SET(EMBREE_ISA_AVX512SKX @EMBREE_ISA_AVX512SKX@)
|
|
|
|
-SET(EMBREE_BUILD_TYPE @CMAKE_BUILD_TYPE@)
|
|
SET(EMBREE_ISPC_SUPPORT @EMBREE_ISPC_SUPPORT@)
|
|
SET(EMBREE_STATIC_LIB @EMBREE_STATIC_LIB@)
|
|
SET(EMBREE_TUTORIALS @EMBREE_TUTORIALS@)
|
|
@@ -53,10 +50,6 @@ IF (EMBREE_STATIC_LIB)
|
|
INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/simd-targets.cmake")
|
|
INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/lexers-targets.cmake")
|
|
INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/tasking-targets.cmake")
|
|
-
|
|
- add_library(TBB::tbb SHARED IMPORTED)
|
|
- set_target_properties(TBB::tbb PROPERTIES IMPORTED_LOCATION "${EMBREE_ROOT_DIR}/@EMBREE_INSTALLED_TBB@")
|
|
-
|
|
ENDIF()
|
|
|
|
INCLUDE("${EMBREE_ROOT_DIR}/@EMBREE_CMAKEEXPORT_DIR@/embree-targets.cmake")
|
|
diff --git a/common/cmake/package.cmake b/common/cmake/package.cmake
|
|
index a4da0001a..b6f82e981 100644
|
|
--- a/common/cmake/package.cmake
|
|
+++ b/common/cmake/package.cmake
|
|
@@ -20,16 +20,6 @@ ELSE()
|
|
ENDIF()
|
|
ENDIF()
|
|
|
|
-##############################################################
|
|
-# Install MSVC runtime
|
|
-##############################################################
|
|
-
|
|
-IF (WIN32)
|
|
- SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
|
|
- INCLUDE(InstallRequiredSystemLibraries)
|
|
- LIST(FILTER CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS INCLUDE REGEX ".*msvcp[0-9]+\.dll|.*vcruntime[0-9]+\.dll|.*vcruntime[0-9]+_[0-9]+\.dll")
|
|
- INSTALL(FILES ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT lib)
|
|
-ENDIF()
|
|
|
|
##############################################################
|
|
# Install Headers
|
|
@@ -106,18 +96,9 @@ ELSE()
|
|
ENDIF()
|
|
ENDIF()
|
|
|
|
-IF (WIN32 OR EMBREE_ZIP_MODE)
|
|
- # for local "installs" and on Windows we want the cmake config files placed
|
|
- # in the install root, such that users can point the CMake variable
|
|
- # embree_DIR just to the install folder
|
|
- SET(EMBREE_CMAKECONFIG_DIR ".")
|
|
- SET(EMBREE_CMAKEEXPORT_DIR "cmake")
|
|
- SET(EMBREE_RELATIV_ROOT_DIR ".")
|
|
-ELSE()
|
|
- SET(EMBREE_CMAKECONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/embree-${EMBREE_VERSION}")
|
|
- SET(EMBREE_CMAKEEXPORT_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/embree-${EMBREE_VERSION}")
|
|
- FILE(RELATIVE_PATH EMBREE_RELATIV_ROOT_DIR "/${EMBREE_CMAKECONFIG_DIR}" "/")
|
|
-ENDIF()
|
|
+SET(EMBREE_CMAKECONFIG_DIR "share/embree")
|
|
+SET(EMBREE_CMAKEEXPORT_DIR "share/embree3")
|
|
+SET(EMBREE_RELATIV_ROOT_DIR "../..")
|
|
|
|
CONFIGURE_FILE(common/cmake/embree-config.cmake embree-config-install.cmake @ONLY)
|
|
CONFIGURE_FILE(common/cmake/embree-config-version.cmake embree-config-version.cmake @ONLY)
|
|
diff --git a/common/tasking/CMakeLists.txt b/common/tasking/CMakeLists.txt
|
|
index 71ef29612..c846004e3 100644
|
|
--- a/common/tasking/CMakeLists.txt
|
|
+++ b/common/tasking/CMakeLists.txt
|
|
@@ -10,7 +10,7 @@ ELSEIF (TASKING_TBB)
|
|
if (NOT ${EMBREE_TBB_ROOT} STREQUAL "")
|
|
set(TBB_ROOT ${EMBREE_TBB_ROOT})
|
|
endif()
|
|
- FIND_PACKAGE(TBB REQUIRED tbb)
|
|
+ FIND_PACKAGE(TBB CONFIG REQUIRED tbb)
|
|
|
|
##############################################################
|
|
# Create tasking target and link against TBB. Also set include directory
|
|
@@ -18,10 +18,7 @@ ELSEIF (TASKING_TBB)
|
|
# with the TBB header files
|
|
##############################################################
|
|
ADD_LIBRARY(tasking STATIC taskschedulertbb.cpp)
|
|
- TARGET_LINK_LIBRARIES(tasking PUBLIC TBB)
|
|
- TARGET_INCLUDE_DIRECTORIES(tasking PUBLIC "${TBB_INCLUDE_DIRS}")
|
|
-
|
|
- include(installTBB)
|
|
+ TARGET_LINK_LIBRARIES(tasking PUBLIC TBB::tbb)
|
|
|
|
ELSEIF (TASKING_PPL)
|
|
ADD_LIBRARY(tasking STATIC taskschedulerppl.cpp)
|