Author: tfaber Date: Mon May 20 18:27:07 2013 New Revision: 59058
URL: http://svn.reactos.org/svn/reactos?rev=59058&view=rev Log: [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
Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in trunk/reactos/cmake/CMakeMacros.cmake trunk/reactos/configure.cmd trunk/reactos/configure.sh
Modified: trunk/reactos/boot/bootdata/packages/reactos.dff.in URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/reac... ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff.in [iso-8859-1] Mon May 20 18:27:07 2013 @@ -61,5 +61,3 @@ 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
Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?rev... ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Mon May 20 18:27:07 2013 @@ -116,7 +116,7 @@ elseif(${dir} STREQUAL reactos/Resources/Themes) set(${var} 16) else() - message(ERROR "Wrong destination: ${dir}") + message(FATAL_ERROR "Wrong destination: ${dir}") endif() endmacro()
Modified: trunk/reactos/configure.cmd URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.cmd?rev=59058&... ============================================================================== --- trunk/reactos/configure.cmd [iso-8859-1] (original) +++ trunk/reactos/configure.cmd [iso-8859-1] Mon May 20 18:27:07 2013 @@ -188,7 +188,7 @@
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
Modified: trunk/reactos/configure.sh URL: http://svn.reactos.org/svn/reactos/trunk/reactos/configure.sh?rev=59058&... ============================================================================== --- trunk/reactos/configure.sh [iso-8859-1] (original) +++ trunk/reactos/configure.sh [iso-8859-1] Mon May 20 18:27:07 2013 @@ -36,4 +36,4 @@
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...).