mirror of
https://github.com/Open-Cascade-SAS/OCCT.git
synced 2026-05-10 01:20:50 +08:00
Configuration, CMake - Build config file is invalid (#647)
- Fixed missing `@` delimiter in template variable substitution for QT directory detection - Added compiler bitness calculation before custom script generation - Implemented nested variable expansion for custom build paths
This commit is contained in:
@@ -1203,6 +1203,7 @@ if (${DRAWEXE_INDEX} GREATER -1)
|
||||
OCCT_COPY_FILE_OR_DIR ("adm/templates/draw.${SCRIPT_EXT}" "${CMAKE_BINARY_DIR}")
|
||||
endif()
|
||||
|
||||
OCCT_MAKE_COMPILER_BITNESS()
|
||||
set (SUB_CUSTOM_NAME "custom_${COMPILER}_${COMPILER_BITNESS}.${SCRIPT_EXT}")
|
||||
|
||||
if (WIN32)
|
||||
@@ -1333,6 +1334,11 @@ else()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
# Expand OCCT_CUSTOM_BUILD_BIN_LIB_PATHS variable to resolve nested @...@ variables
|
||||
if (OCCT_CUSTOM_BUILD_BIN_LIB_PATHS)
|
||||
string(CONFIGURE "${OCCT_CUSTOM_BUILD_BIN_LIB_PATHS}" OCCT_CUSTOM_BUILD_BIN_LIB_PATHS @ONLY)
|
||||
endif()
|
||||
|
||||
# write current custom.bat/sh (for build directory)
|
||||
OCCT_CONFIGURE ("adm/templates/custom.build.${SCRIPT_EXT}.in" "${SUB_CUSTOM_NAME}")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user