lili/OCCT
1
0
Fork 0
mirror of https://github.com/Open-Cascade-SAS/OCCT.git synced 2026-05-10 09:30:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Configuration, CMake - Build config file is invalid (#647)

Browse Source 
- 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:
Pasukhin Dmitry
2025-07-27 12:33:37 +01:00
committed by GitHub
parent 9134c601a4
commit 3175e001b1
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -1203,6 +1203,7 @@ if (${DRAWEXE_INDEX} GREATER -1)
OCCT_COPY_FILE_OR_DIR ("adm/templates/draw.${SCRIPT_EXT}" "${CMAKE_BINARY_DIR}") OCCT_COPY_FILE_OR_DIR ("adm/templates/draw.${SCRIPT_EXT}" "${CMAKE_BINARY_DIR}")
endif() endif()
OCCT_MAKE_COMPILER_BITNESS()
set (SUB_CUSTOM_NAME "custom_${COMPILER}_${COMPILER_BITNESS}.${SCRIPT_EXT}") set (SUB_CUSTOM_NAME "custom_${COMPILER}_${COMPILER_BITNESS}.${SCRIPT_EXT}")
if (WIN32) if (WIN32)
@@ -1333,6 +1334,11 @@ else()
endif() endif()
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) # write current custom.bat/sh (for build directory)
OCCT_CONFIGURE ("adm/templates/custom.build.${SCRIPT_EXT}.in" "${SUB_CUSTOM_NAME}") OCCT_CONFIGURE ("adm/templates/custom.build.${SCRIPT_EXT}.in" "${SUB_CUSTOM_NAME}")

2
adm/templates/custom.build.sh.in
View File

@@ -14,7 +14,7 @@ if [ "$1" == "@BIN_LETTER@" ]; then
export FFMPEG_DIR="@3RDPARTY_FFMPEG_LIBRARY_DIR@" export FFMPEG_DIR="@3RDPARTY_FFMPEG_LIBRARY_DIR@"
export JEMALLOC_DIR="@3RDPARTY_JEMALLOC_LIBRARY_DIR@" export JEMALLOC_DIR="@3RDPARTY_JEMALLOC_LIBRARY_DIR@"
if [ "x@3RDPARTY_QT_DIR" != "x" ]; then if [ "x@3RDPARTY_QT_DIR@" != "x" ]; then
export QTDIR="@3RDPARTY_QT_DIR@" export QTDIR="@3RDPARTY_QT_DIR@"
fi fi