diff --git a/RosBE-Windows/Powershell/RosBE.ps1 b/RosBE-Windows/Powershell/RosBE.ps1 index c46eaf0..c5cc8a0 100644 --- a/RosBE-Windows/Powershell/RosBE.ps1 +++ b/RosBE-Windows/Powershell/RosBE.ps1 @@ -62,11 +62,7 @@ $global:_ROSBE_HOST_MINGWPATH = "$_ROSBE_BASEDIR\i386_be" $global:_ROSBE_TARGET_MINGWPATH = "$_ROSBE_BASEDIR\$ENV:ROS_ARCH_be" $global:_BUILDBOT_SVNSKIPMAINTRUNK = "0" -if ("$ENV:_ROSBE_CMAKEPATH" -eq "") { - $ENV:_ROSBE_CMAKEPATH = Get-Content "$_ROSBE_BASEDIR\cmakepath.cfg" -} - -$global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$ENV:SystemRoot\system32;$ENV:SystemRoot;$ENV:SystemRoot\System32\Wbem;$ENV:SYSTEMROOT\System32\WindowsPowerShell\v1.0;$ENV:_ROSBE_CMAKEPATH\bin" +$global:_ROSBE_ORIGINALPATH = "$_ROSBE_BASEDIR;$_ROSBE_BASEDIR\Tools;$ENV:SystemRoot\system32;$ENV:SystemRoot;$ENV:SystemRoot\System32\Wbem;$ENV:SYSTEMROOT\System32\WindowsPowerShell\v1.0;$_ROSBE_BASEDIR\Tools\cmake\bin" # Fix Bison package path (just in case RosBE is installed in a path which contains spaces) $ENV:BISON_PKGDATADIR = ((New-Object -ComObject Scripting.FileSystemObject).GetFolder("$_ROSBE_HOST_MINGWPATH\share\bison")).ShortPath diff --git a/RosBE-Windows/Powershell/version.ps1 b/RosBE-Windows/Powershell/version.ps1 index 640095e..fd62815 100644 --- a/RosBE-Windows/Powershell/version.ps1 +++ b/RosBE-Windows/Powershell/version.ps1 @@ -30,11 +30,4 @@ if (Test-Path "$_ROSBE_HOST_MINGWPATH\bin\nasm.exe") { $fver = (& flex '--version') -replace ".*version ((\d|\.)+).*",'$1' "flex $fver" & mingw32-make.exe -v | & find "GNU Make" -$null = "$ENV:PATH" | select-string -pattern "cmake" -if ($LASTEXITCODE -ne 0) { - "" - "WARNING: CMake not found! You have to load and install it from http://www.cmake.org/" - "------------------------------------------------------------------------------------" -} else { - cmake.exe --version -} +cmake.exe --version diff --git a/RosBE-Windows/Root/RosBE.cmd b/RosBE-Windows/Root/RosBE.cmd index f9e5cb6..8ba6228 100644 --- a/RosBE-Windows/Root/RosBE.cmd +++ b/RosBE-Windows/Root/RosBE.cmd @@ -40,11 +40,7 @@ set _ROSBE_HOST_MINGWPATH=%_ROSBE_BASEDIR%\i386_be set _ROSBE_TARGET_MINGWPATH=%_ROSBE_BASEDIR%\%ROS_ARCH%_be set _BUILDBOT_SVNSKIPMAINTRUNK=0 -if not defined _ROSBE_CMAKEPATH ( - for /f "usebackq" %%i in (`type "%_ROSBE_BASEDIR%\cmakepath.cfg"`) do set _ROSBE_CMAKEPATH=%%i -) - -set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_BASEDIR%\samples;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem;%_ROSBE_CMAKEPATH%\bin +set _ROSBE_ORIGINALPATH=%_ROSBE_BASEDIR%;%_ROSBE_BASEDIR%\Tools;%_ROSBE_BASEDIR%\samples;%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem;%_ROSBE_BASEDIR%\Tools\cmake\bin :: Fix Bison package path (just in case RosBE is installed in a path which contains spaces) set BISON_PKGDATADIR=%~ds0%~sp0%i386\share\bison diff --git a/RosBE-Windows/Root/version.cmd b/RosBE-Windows/Root/version.cmd index 77a6a65..1b14236 100644 --- a/RosBE-Windows/Root/version.cmd +++ b/RosBE-Windows/Root/version.cmd @@ -33,11 +33,4 @@ if exist "%_ROSBE_HOST_MINGWPATH%\bin\nasm.exe" ( bison --version | find "GNU Bison" flex --version mingw32-make.exe -v | find "GNU Make" -echo %PATH% | find "cmake" /I 1> NUL 2> NUL -if errorlevel 1 ( - echo. - echo WARNING: CMake not found! You have to load and install it from http://www.cmake.org/ - echo ------------------------------------------------------------------------------------ -) else ( - cmake.exe --version -) +cmake.exe --version