early-access version 2853
This commit is contained in:
33
externals/vcpkg/ports/opencascade/fix-pdb-find.patch
vendored
Executable file
33
externals/vcpkg/ports/opencascade/fix-pdb-find.patch
vendored
Executable file
@@ -0,0 +1,33 @@
|
||||
diff --git a/adm/cmake/cotire.cmake b/adm/cmake/cotire.cmake
|
||||
index a63f3ce..aa77c20 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 2f96c6f..78f15f0 100644
|
||||
--- a/adm/cmake/occt_toolkit.cmake
|
||||
+++ b/adm/cmake/occt_toolkit.cmake
|
||||
@@ -235,7 +235,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)
|
||||
if (BUILD_FORCE_RelWithDebInfo)
|
||||
set (aReleasePdbConf "Release")
|
||||
else()
|
||||
Reference in New Issue
Block a user