mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-12 15:59:01 +08:00
34 lines
1.6 KiB
Diff
34 lines
1.6 KiB
Diff
|
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}")
|