Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-27 21:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMAKE]

Browse source 
- configure no longer defaults to nmake, don't confuse the user
- Properly escape exclamation mark in configure message

svn path=/trunk/; revision=59281
This commit is contained in:
Thomas Faber 2013-06-22 08:05:50 +00:00
parent dc5e210e8f
commit b5de08425e
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
reactos/configure.cmd
View file

@ -21,7 +21,7 @@ if /I "%1" == "arm_hosttools" (
:: Get the source root directory
set REACTOS_SOURCE_DIR=%~dp0
set USE_NMAKE=0
set USE_VSCMD=0
:: Detect presence of cmake
cmd /c cmake --version 2>&1 | find "cmake version" > NUL || goto cmake_notfound
@ -49,7 +49,7 @@ if defined ROS_ARCH (
) else if "%_BUILDARCH%" == "AMD64" (
set ARCH=amd64
)
set USE_NMAKE=1
set USE_VSCMD=1
set USE_WDK_HEADERS=0
) else if defined VCINSTALLDIR (
@ -96,8 +96,8 @@ if defined ROS_ARCH (
)
)
) else (
set USE_NMAKE=1
echo This script defaults to nmake. To use Visual Studio GUI specify "VSSolution" as a parameter.
set USE_VSCMD=1
echo This script defaults to Ninja. To use Visual Studio GUI specify "VSSolution" as a parameter.
)
) else if defined sdkdir (
@ -109,7 +109,7 @@ if defined ROS_ARCH (
)
set BUILD_ENVIRONMENT=SDK
set USE_NMAKE=1
set USE_VSCMD=1
) else (
echo Error: Unable to detect build environment. Configure script failure.
@ -122,8 +122,8 @@ if not defined ARCH (
exit /b
)
:: Detect nmake generator
if %USE_NMAKE% == 1 (
:: Detect VS command line generator
if %USE_VSCMD% == 1 (
if /I "%1" == "CodeBlocks" (
set CMAKE_GENERATOR="CodeBlocks - NMake Makefiles"
) else if /I "%1" == "Eclipse" (
@ -186,9 +186,9 @@ if "%BUILD_ENVIRONMENT%" == "MinGW" (
cd..
echo Configure script complete! Enter directories and execute appropriate build commands(ex: ninja, make, nmake, etc...).
echo Configure script complete^^! Enter directories and execute appropriate build commands (ex: ninja, make, nmake, etc...).
exit /b
:cmake_notfound
echo Unable to find cmake, if it is installed, check your PATH variable.
exit /b
echo Unable to find cmake, if it is installed, check your PATH variable.
exit /b