Commit 855b897d authored by Jussi Lindgren's avatar Jussi Lindgren

Build: Removed cmake from the PATH to address dll issues

Python interpreter was seemingly picking up cmake's versions of the MSVC*
libraries, causing problems.
parent 799067fd
......@@ -79,7 +79,7 @@ cd /D %ov_build_dir%
echo Generating makefiles for %VSCMake% using %BuildType% config.
echo Building to %ov_build_dir% ...
cmake %ov_script_dir%\.. -G"NMake Makefiles" -DCMAKE_BUILD_TYPE=%BuildType% -DCMAKE_INSTALL_PREFIX=%ov_install_dir%
%ov_script_dir%\..\dependencies\cmake\bin\cmake %ov_script_dir%\.. -G"NMake Makefiles" -DCMAKE_BUILD_TYPE=%BuildType% -DCMAKE_INSTALL_PREFIX=%ov_install_dir%
IF NOT "!ERRORLEVEL!" == "0" goto terminate_error
echo.
......
......@@ -20,7 +20,7 @@ cd /D %ov_build_dir%
echo Generating %VCSMake% project files to %ov_build_dir% ...
cmake %ov_script_dir%\.. -G"%VSCMake%" -DCMAKE_INSTALL_PREFIX=%ov_install_dir%
%ov_script_dir%\..\dependencies\cmake\bin\cmake %ov_script_dir%\.. -G"%VSCMake%" -DCMAKE_INSTALL_PREFIX=%ov_install_dir%
IF NOT "!ERRORLEVEL!" == "0" goto terminate_error
echo.
......
......@@ -156,10 +156,9 @@ Section "CMake"
no_need_to_download_cmake:
ZipDLL::extractall "arch\cmake-2.8.7-win32-x86-ov2.zip" ""
FileOpen $0 "$EXEDIR\win32-dependencies.cmd" a
FileSeek $0 0 END
FileWrite $0 "SET PATH=$INSTDIR\cmake\bin;%PATH%$\r$\n"
FileClose $0
; Note: Do NOT put cmake bin on the PATH, as/if it contains MSVC* libraries. These have been
; observed to have been picked up by third-party software like the python interpreter
; and caused hard-to-trace manifest errors.
SectionEnd
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment