Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-21 18:16:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
- Produce a proper error when add_cd_file is used with an unknown folder
- Remove an rbuild-leftover in reactos.dff.in
- Update outdated build tool message in configure

svn path=/trunk/; revision=59058
This commit is contained in:
Thomas Faber 2013-05-20 18:27:07 +00:00
parent 272029e3dc
commit e73afacf0f
4 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/boot/bootdata/packages/reactos.dff.in
View file

@ -61,5 +61,3 @@ modules\optional\vmx_svga.inf 6 optional
modules\optional\vmx_svga.sys 2 optional modules\optional\vmx_svga.sys 2 optional
modules\optional\wine_gecko-1.9-x86.msi 4 optional modules\optional\wine_gecko-1.9-x86.msi 4 optional
boot\bootdata\bootcdregtest\AHKAppTests.cmd 7 optional boot\bootdata\bootcdregtest\AHKAppTests.cmd 7 optional
modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional

2
reactos/cmake/CMakeMacros.cmake
View file

@ -116,7 +116,7 @@ macro(dir_to_num dir var)
elseif(${dir} STREQUAL reactos/Resources/Themes) elseif(${dir} STREQUAL reactos/Resources/Themes)
set(${var} 16) set(${var} 16)
else() else()
message(ERROR "Wrong destination: ${dir}") message(FATAL_ERROR "Wrong destination: ${dir}")
endif() endif()
endmacro() endmacro()

2
reactos/configure.cmd
View file

@ -188,7 +188,7 @@ if "%BUILD_ENVIRONMENT%" == "MinGW" (
cd.. cd..
echo Configure script complete! Enter directories and execute appropriate build commands(ex: make, nmake, jom, etc...). echo Configure script complete! Enter directories and execute appropriate build commands(ex: ninja, make, nmake, etc...).
exit /b exit /b
:cmake_notfound :cmake_notfound

2
reactos/configure.sh
View file

@ -36,4 +36,4 @@ rm -f CMakeCache.txt
cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR" cmake -G "$CMAKE_GENERATOR" -DENABLE_CCACHE=0 -DPCH=0 -DCMAKE_TOOLCHAIN_FILE=toolchain-gcc.cmake -DARCH=$ARCH -DREACTOS_BUILD_TOOLS_DIR="$REACTOS_BUILD_TOOLS_DIR" "$REACTOS_SOURCE_DIR"
echo Configure script complete! Enter directories and execute appropriate build commands\(ex: make, makex, etc...\). echo Configure script complete! Enter directories and execute appropriate build commands\(ex: ninja, make, makex, etc...\).