mirror of
https://github.com/ApfelTeeSaft/reactos.git
synced 2026-09-02 12:23:31 +00:00
[CMAKE]
- 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:
@@ -61,5 +61,3 @@ modules\optional\vmx_svga.inf 6 optional
|
||||
modules\optional\vmx_svga.sys 2 optional
|
||||
modules\optional\wine_gecko-1.9-x86.msi 4 optional
|
||||
boot\bootdata\bootcdregtest\AHKAppTests.cmd 7 optional
|
||||
|
||||
modules\wallpaper\Angelus_02_ROSWP.bmp 4 optional
|
||||
|
||||
@@ -116,7 +116,7 @@ macro(dir_to_num dir var)
|
||||
elseif(${dir} STREQUAL reactos/Resources/Themes)
|
||||
set(${var} 16)
|
||||
else()
|
||||
message(ERROR "Wrong destination: ${dir}")
|
||||
message(FATAL_ERROR "Wrong destination: ${dir}")
|
||||
endif()
|
||||
endmacro()
|
||||
|
||||
|
||||
@@ -188,7 +188,7 @@ if "%BUILD_ENVIRONMENT%" == "MinGW" (
|
||||
|
||||
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
|
||||
|
||||
:cmake_notfound
|
||||
|
||||
@@ -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"
|
||||
|
||||
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...\).
|
||||
|
||||
Reference in New Issue
Block a user