|
| 1 | +diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 2 | +index fca978164..dda41e2c6 100644 |
| 3 | +--- a/CMakeLists.txt |
| 4 | ++++ b/CMakeLists.txt |
| 5 | +@@ -426,6 +426,9 @@ endforeach() |
| 6 | + if (NOT BUILD_SHARED_LIBS) |
| 7 | + list (REMOVE_ITEM BUILD_TOOLKITS DRAWEXE) |
| 8 | + message (STATUS "Info: DRAWEXE is not included due to ${BUILD_LIBRARY_TYPE} build library type") |
| 9 | ++ # IfcOpenShell begin |
| 10 | ++ add_definitions(-DHAVE_NO_DLL) |
| 11 | ++ # IfcOpenShell end |
| 12 | + endif() |
| 13 | + |
| 14 | + # accumulate all used toolkits |
| 15 | +diff --git a/adm/cmake/occt_defs_flags.cmake b/adm/cmake/occt_defs_flags.cmake |
| 16 | +index 09da18d38..a07b9cf74 100644 |
| 17 | +--- a/adm/cmake/occt_defs_flags.cmake |
| 18 | ++++ b/adm/cmake/occt_defs_flags.cmake |
| 19 | +@@ -138,5 +138,21 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX OR MINGW) |
| 20 | + set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s") |
| 21 | + endif() |
| 22 | + |
| 23 | +-set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception") |
| 24 | +-set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception") |
| 25 | ++# IfcOpenShell begin |
| 26 | ++# https://salsa.debian.org/science-team/opencascade/blob/739e7e9c4fbe575165eb3ff0251774bfad27139e/debian/patches/enable-exception-handling.patch |
| 27 | ++# set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNo_Exception") |
| 28 | ++# set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNo_Exception") |
| 29 | ++ |
| 30 | ++if (MSVC) |
| 31 | ++ foreach(flag CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE CMAKE_CXX_FLAGS_MINSIZEREL |
| 32 | ++ CMAKE_CXX_FLAGS_RELWITHDEBINFO CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE |
| 33 | ++ CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO) |
| 34 | ++ if (${flag} MATCHES "/MD") |
| 35 | ++ string(REGEX REPLACE "/MD" "/MT" ${flag} "${${flag}}") |
| 36 | ++ endif() |
| 37 | ++ if (${flag} MATCHES "/MDd") |
| 38 | ++ string(REGEX REPLACE "/MDd" "/MTd" ${flag} "${${flag}}") |
| 39 | ++ endif() |
| 40 | ++ endforeach() |
| 41 | ++endif() |
| 42 | ++# IfcOpenShell end |
| 43 | +diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake |
| 44 | +index f59b1639d..aee227516 100644 |
| 45 | +--- a/adm/cmake/occt_toolkit.cmake |
| 46 | ++++ b/adm/cmake/occt_toolkit.cmake |
| 47 | +@@ -208,11 +208,26 @@ if (EXECUTABLE_PROJECT) |
| 48 | + else() |
| 49 | + add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES}) |
| 50 | + |
| 51 | +- if (MSVC) |
| 52 | +- install (FILES ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb |
| 53 | +- CONFIGURATIONS Debug RelWithDebInfo |
| 54 | +- DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}") |
| 55 | ++ # IfcOpenShell begin |
| 56 | ++ if (BUILD_SHARED_LIBS) |
| 57 | ++ if (MSVC) |
| 58 | ++ install (FILES ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb |
| 59 | ++ CONFIGURATIONS Debug RelWithDebInfo |
| 60 | ++ DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}") |
| 61 | ++ endif() |
| 62 | ++ else() |
| 63 | ++ if (MSVC) |
| 64 | ++ set_target_properties (${PROJECT_NAME} PROPERTIES |
| 65 | ++ COMPILE_PDB_NAME ${PROJECT_NAME} |
| 66 | ++ COMPILE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/pdb/ |
| 67 | ++ ) |
| 68 | ++ |
| 69 | ++ install (FILES ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/pdb/\${CMAKE_INSTALL_CONFIG_NAME}/${PROJECT_NAME}.pdb |
| 70 | ++ CONFIGURATIONS Debug RelWithDebInfo |
| 71 | ++ DESTINATION "${INSTALL_DIR_LIB}\${OCCT_INSTALL_BIN_LETTER}") |
| 72 | ++ endif() |
| 73 | + endif() |
| 74 | ++ # IfcOpenShell end |
| 75 | + |
| 76 | + if (BUILD_SHARED_LIBS AND NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "") |
| 77 | + set (CMAKE_SHARED_LIBRARY_SUFFIX_DEFAULT ${CMAKE_SHARED_LIBRARY_SUFFIX}) |
0 commit comments