# HG changeset patch # User koda # Date 1372328315 -7200 # Node ID 9749524d176723e32c82b6b9433f8c179267f6ba # Parent 118cc5c1f67714ed1f7fc4a9ac1ca51e7eed9e92 restore the GLUT check diff -r 118cc5c1f677 -r 9749524d1767 cmake_modules/utils.cmake --- a/cmake_modules/utils.cmake Thu Jun 27 12:09:24 2013 +0200 +++ b/cmake_modules/utils.cmake Thu Jun 27 12:18:35 2013 +0200 @@ -12,7 +12,7 @@ find_package(${_PKG_NAME}) string(TOUPPER ${_PKG_NAME} _PKG_NAME_UP) if(NOT ${_PKG_NAME_UP}_FOUND) - message(SEND_ERROR "Missing ${_PKG_NAME}! Rerun cmake with -D${_VAR_NAME}=1 to build without it.") + message(SEND_ERROR "Missing ${_PKG_NAME}! Rerun cmake with -D${_VAR_NAME}=1 to skip this error.") endif(NOT ${_PKG_NAME_UP}_FOUND) endmacro(find_package_or_disable _PKG_NAME _VAR_NAME) diff -r 118cc5c1f677 -r 9749524d1767 hedgewars/CMakeLists.txt --- a/hedgewars/CMakeLists.txt Thu Jun 27 12:09:24 2013 +0200 +++ b/hedgewars/CMakeLists.txt Thu Jun 27 12:18:35 2013 +0200 @@ -105,6 +105,8 @@ list(APPEND HW_LINK_LIBS avwrapper) add_definitions(-dUSE_VIDEO_RECORDING) add_flag_append(CMAKE_Pascal_FLAGS -Fl${LIBRARY_OUTPUT_PATH}) + #only for SDL < 2, linking carried out by fpc + find_package_or_disable_msg(GLUT NOVIDEOREC "Video recording will not be built") endif() find_package_or_disable_msg(PNG NOPNG "Screenshots will be saved in BMP")