forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[opencascade] Update to 7.5.0 (microsoft#15997)
* [opencascade] Update to 7.5.0 * update version
- Loading branch information
1 parent
d316fd1
commit 0c32fc5
Showing
9 changed files
with
44 additions
and
133 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
diff --git a/adm/cmake/cotire.cmake b/adm/cmake/cotire.cmake | ||
index 6cf0cb66..2a9b1793 100644 | ||
--- a/adm/cmake/cotire.cmake | ||
+++ b/adm/cmake/cotire.cmake | ||
@@ -3114,6 +3114,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target) | ||
OSX_ARCHITECTURES OSX_ARCHITECTURES_<CONFIG> PRIVATE_HEADER PUBLIC_HEADER RESOURCE XCTEST | ||
IOS_INSTALL_COMBINED) | ||
# copy Windows platform specific stuff | ||
+ if (BUILD_SHARED_LIBS) | ||
cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} | ||
GNUtoMS | ||
COMPILE_PDB_NAME COMPILE_PDB_NAME_<CONFIG> | ||
@@ -3129,6 +3130,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target) | ||
WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS | ||
DEPLOYMENT_REMOTE_DIRECTORY VS_CONFIGURATION_TYPE | ||
VS_SDK_REFERENCES) | ||
+ endif() | ||
# copy Android platform specific stuff | ||
cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName} | ||
ANDROID_API ANDROID_API_MIN ANDROID_GUI | ||
diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake | ||
index 79605059..630a978e 100644 | ||
--- a/adm/cmake/occt_toolkit.cmake | ||
+++ b/adm/cmake/occt_toolkit.cmake | ||
@@ -231,7 +231,7 @@ if (EXECUTABLE_PROJECT) | ||
else() | ||
add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES}) | ||
|
||
- if (MSVC) | ||
+ if (MSVC AND BUILD_SHARED_LIBS) | ||
install (FILES ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb | ||
CONFIGURATIONS Debug RelWithDebInfo | ||
DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}") |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters