From: Pasukhin Dmitry Date: Sat, 24 May 2025 11:27:14 +0000 (+0100) Subject: Configuration - Fixed issue with CSF variable overwriting #561 X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=3b62a5eb2994cd2d5df798cd66c2addd950a3a40;p=occt.git Configuration - Fixed issue with CSF variable overwriting #561 Include occt_csf file to define CSF variable before usage. --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 5235335235..29112db008 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -484,6 +484,9 @@ OCCT_IS_PRODUCT_REQUIRED (CSF_EIGEN CAN_USE_EIGEN) set (OCCT_3RDPARTY_CMAKE_LIST) +# define CSF variable +OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_csf") + # Tcl (mandatory for Draw Harness) if (USE_TCL) message (STATUS "Info: TCL is used by OCCT") @@ -779,9 +782,6 @@ file(COPY ${CMAKE_SOURCE_DIR}/.clang-format DESTINATION ${CMAKE_SOURCE_DIR}) OCCT_MAKE_OS_WITH_BITNESS() OCCT_MAKE_COMPILER_SHORT_NAME() -# define CSF variable -OCCT_INCLUDE_CMAKE_FILE ("adm/cmake/occt_csf") - # do not define INSTALL_DIR_BIN for win. # Leave library structure for win: /win64/vc10/bin(d) if (NOT DEFINED INSTALL_DIR_BIN)