2022-01-10 13:22:40 +00:00
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
|
|
|
|
@@ -1229,7 +1229,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONFIGURATION_TYPES})
|
2021-12-27 00:15:08 +00:00
|
|
|
endforeach()
|
|
|
|
|
# install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
|
|
|
|
|
install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")
|
|
|
|
|
-install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
|
|
|
|
|
+install (CODE "configure_file(\"${CMAKE_BINARY_DIR}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADECompileDefinitionsAndFlags-\${CMAKE_INSTALL_CONFIG_NAME_LOWER}.cmake\" COPYONLY)")
|
|
|
|
|
|
|
|
|
|
foreach (OCCT_MODULE ${OCCT_MODULES})
|
|
|
|
|
if (BUILD_MODULE_${OCCT_MODULE})
|
2022-01-10 13:22:40 +00:00
|
|
|
diff --git a/adm/cmake/occt_macros.cmake b/adm/cmake/occt_macros.cmake
|
|
|
|
|
index 0a387945..e3f13923 100644
|
|
|
|
|
--- a/adm/cmake/occt_macros.cmake
|
|
|
|
|
+++ b/adm/cmake/occt_macros.cmake
|
|
|
|
|
@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
|
2021-12-27 00:15:08 +00:00
|
|
|
"cmake_policy(PUSH)
|
|
|
|
|
cmake_policy(SET CMP0007 NEW)
|
|
|
|
|
string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
|
|
|
|
|
- file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
|
|
|
|
|
+ file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
|
|
|
|
|
foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
|
|
|
|
|
file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
|
|
|
|
|
file (REMOVE \"\${TARGET_FILENAME}\")
|
