Hello, bundled cmake. Just copy the cmake bin and share folders in a subfolder inside RosBE's tools folder. Call this subfolder cmake and you are done.

svn path=/trunk/RosBE/; revision=1298
This commit is contained in:
Daniel Reimer 2011-06-04 09:52:25 +00:00
parent 41b91150a0
commit 2df523d5ae
4 changed files with 4 additions and 26 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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