mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 05:21:29 +08:00
02e210ef56
* update to 7.8.0 * update version * update version * update version * fix dep * update version * del patch * update version
114 lines
3.7 KiB
Diff
114 lines
3.7 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 8690528..834ca79 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -605,7 +605,8 @@ if (CAN_USE_FREETYPE)
|
|
if (USE_FREETYPE)
|
|
message (STATUS "Info: FreeType is used by OCCT")
|
|
add_definitions (-DHAVE_FREETYPE)
|
|
- OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freetype")
|
|
+ find_package(Freetype MODULE REQUIRED)
|
|
+ set(CSF_FREETYPE Freetype::Freetype)
|
|
else()
|
|
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREETYPE")
|
|
OCCT_CHECK_AND_UNSET ("3RDPARTY_FREETYPE_INCLUDE_DIR_freetype2")
|
|
@@ -622,7 +623,9 @@ endif()
|
|
if (USE_VTK)
|
|
add_definitions (-DHAVE_VTK)
|
|
set (OCCT_VTK_USED_TARGETS "" CACHE INTERNAL "" FORCE)
|
|
- OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/vtk")
|
|
+ find_package(VTK REQUIRED)
|
|
+ set(CSF_VTK VTK::CommonCore)
|
|
+ set(IS_VTK_9XX 1)
|
|
else()
|
|
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_VTK")
|
|
|
|
@@ -638,7 +641,8 @@ endif()
|
|
if (CAN_USE_FREEIMAGE)
|
|
if (USE_FREEIMAGE)
|
|
add_definitions (-DHAVE_FREEIMAGE)
|
|
- OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/freeimage")
|
|
+ find_package(freeimage CONFIG REQUIRED)
|
|
+ set(CSF_FreeImagePlus freeimage::FreeImagePlus)
|
|
else()
|
|
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_FREEIMAGE")
|
|
OCCT_CHECK_AND_UNSET ("INSTALL_FREEIMAGE")
|
|
@@ -739,7 +743,8 @@ endif()
|
|
if (NOT DEFINED ANDROID AND CAN_USE_TBB)
|
|
if (USE_TBB)
|
|
add_definitions (-DHAVE_TBB)
|
|
- OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/tbb")
|
|
+ find_package(TBB CONFIG REQUIRED)
|
|
+ set(CSF_TBB TBB::tbb TBB::tbbmalloc)
|
|
else()
|
|
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBB")
|
|
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_TBBMALLOC")
|
|
@@ -759,7 +764,8 @@ OCCT_IS_PRODUCT_REQUIRED (CSF_RapidJSON CAN_USE_RAPIDJSON)
|
|
if (CAN_USE_RAPIDJSON)
|
|
if (USE_RAPIDJSON)
|
|
add_definitions (-DHAVE_RAPIDJSON)
|
|
- OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/rapidjson")
|
|
+ find_package(RapidJSON CONFIG REQUIRED)
|
|
+ set(CSF_RapidJSON rapidjson)
|
|
else()
|
|
OCCT_CHECK_AND_UNSET_GROUP ("3RDPARTY_RAPIDJSON")
|
|
OCCT_CHECK_AND_UNSET ("INSTALL_RAPIDJSON")
|
|
diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake
|
|
index c939915..f707e00 100644
|
|
--- a/adm/cmake/occt_toolkit.cmake
|
|
+++ b/adm/cmake/occt_toolkit.cmake
|
|
@@ -475,11 +475,11 @@ else()
|
|
endif()
|
|
endif()
|
|
|
|
-if (BUILD_SHARED_LIBS OR EXECUTABLE_PROJECT)
|
|
+if (1)
|
|
if(IS_VTK_9XX)
|
|
string (REGEX REPLACE "vtk" "VTK::" USED_TOOLKITS_BY_CURRENT_PROJECT "${USED_TOOLKITS_BY_CURRENT_PROJECT}")
|
|
endif()
|
|
- target_link_libraries (${PROJECT_NAME} ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
|
|
+ target_link_libraries (${PROJECT_NAME} PRIVATE ${USED_TOOLKITS_BY_CURRENT_PROJECT} ${USED_EXTERNAL_LIBS_BY_CURRENT_PROJECT})
|
|
endif()
|
|
|
|
if (USE_QT)
|
|
diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in
|
|
index e391ddf..9cc3d49 100644
|
|
--- a/adm/templates/OpenCASCADEConfig.cmake.in
|
|
+++ b/adm/templates/OpenCASCADEConfig.cmake.in
|
|
@@ -5,6 +5,23 @@
|
|
# This file is configured by OpenCASCADE.
|
|
#
|
|
|
|
+include(CMakeFindDependencyMacro)
|
|
+if("@USE_FREEIMAGE@")
|
|
+ find_dependency(freeimage CONFIG)
|
|
+endif()
|
|
+if("@USE_FREETYPE@")
|
|
+ find_dependency(Freetype MODULE)
|
|
+endif()
|
|
+if("@USE_RAPIDJSON@")
|
|
+ find_package(RapidJSON CONFIG REQUIRED)
|
|
+endif()
|
|
+if("@USE_TBB@")
|
|
+ find_dependency(TBB CONFIG)
|
|
+endif()
|
|
+if("@USE_VTK@")
|
|
+ find_dependency(VTK REQUIRED)
|
|
+endif()
|
|
+
|
|
if(OpenCASCADE_ALREADY_INCLUDED)
|
|
return()
|
|
endif()
|
|
diff --git a/src/Image/Image_AlienPixMap.cxx b/src/Image/Image_AlienPixMap.cxx
|
|
index f869e8f..538d5b9 100644
|
|
--- a/src/Image/Image_AlienPixMap.cxx
|
|
+++ b/src/Image/Image_AlienPixMap.cxx
|
|
@@ -21,7 +21,6 @@
|
|
#include <FreeImage.h>
|
|
|
|
#ifdef _MSC_VER
|
|
- #pragma comment( lib, "FreeImage.lib" )
|
|
#endif
|
|
#elif defined(HAVE_WINCODEC)
|
|
#include <wincodec.h>
|