diff options
| -rw-r--r-- | bin/qt-cmake.bat.in | 4 | ||||
| -rwxr-xr-x | bin/qt-cmake.in | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/bin/qt-cmake.bat.in b/bin/qt-cmake.bat.in index 5d831ebce93..934f79c2599 100644 --- a/bin/qt-cmake.bat.in +++ b/bin/qt-cmake.bat.in @@ -7,5 +7,5 @@ set script_dir_path=%~dp0 set cmake_path=@CMAKE_COMMAND@ if not exist "%cmake_path%" set cmake_path=cmake -set toolchain_path=%script_dir_path%\@__GlobalConfig_relative_path_from_bin_dir_to_cmake_config_dir@\qt.toolchain.cmake -"%cmake_path%" -DCMAKE_TOOLCHAIN_FILE="%toolchain_path%" @__qt_cmake_extra@ %* +set CMAKE_TOOLCHAIN_FILE=%script_dir_path%\@__GlobalConfig_relative_path_from_bin_dir_to_cmake_config_dir@\qt.toolchain.cmake +"%cmake_path%" @__qt_cmake_extra@ %* diff --git a/bin/qt-cmake.in b/bin/qt-cmake.in index 363c490960c..5203e49f878 100755 --- a/bin/qt-cmake.in +++ b/bin/qt-cmake.in @@ -16,4 +16,7 @@ toolchain_path="$script_dir_path/@__GlobalConfig_relative_path_from_bin_dir_to_c @extra_qt_cmake_code@ # Find the qt toolchain relative to the absolute bin dir path where the script is located. -exec "$cmake_path" -DCMAKE_TOOLCHAIN_FILE="$toolchain_path" @__qt_cmake_extra@ "$@" +CMAKE_TOOLCHAIN_FILE="$toolchain_path" +export CMAKE_TOOLCHAIN_FILE + +exec "$cmake_path" @__qt_cmake_extra@ "$@" |