# HG changeset patch # User Bryan Dunsmore # Date 1354332520 21600 # Node ID 4307de8780faa8559326360b535ac58a22e7f67e # Parent b5cd8cad2d86b3664c0890065a5aa273466f9cab Move version check of Clang to CMakeLists. diff -r b5cd8cad2d86 -r 4307de8780fa CMakeLists.txt --- a/CMakeLists.txt Fri Nov 30 20:00:58 2012 -0600 +++ b/CMakeLists.txt Fri Nov 30 21:28:40 2012 -0600 @@ -66,6 +66,18 @@ set(CPACK_PACKAGE_VERSION_PATCH 19${version_suffix}) set(HEDGEWARS_PROTO_VER 44) set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}") +SET(REQUIRED_CLANG_VERSION 3.0) + + +# Check LLVM/Clang version +FIND_PACKAGE(Clang) + +IF (CLANG_VERSION VERSION_GREATER REQUIRED_CLANG_VERSION + OR CLANG_VERSION VERSION_EQUAL REQUIRED_CLANG_VERSION) + MESSAGE(STATUS "Found CLANG: ${CLANG_EXECUTABLE} (version ${CLANG_VERSION})") +ELSE() + MESSAGE(FATAL_ERROR "Necessary LLVM/Clang version not found (version >= ${REQUIRED_CLANG_VERSION} required)") +ENDIF() #bundle .app setup diff -r b5cd8cad2d86 -r 4307de8780fa cmake_modules/FindClang.cmake --- a/cmake_modules/FindClang.cmake Fri Nov 30 20:00:58 2012 -0600 +++ b/cmake_modules/FindClang.cmake Fri Nov 30 21:28:40 2012 -0600 @@ -13,13 +13,6 @@ STRING(REGEX MATCH "[0-9]+\\.[0-9]+" CLANG_VERSION_LONG "${CLANG_VERSION_FULL}") STRING(REGEX REPLACE "([0-9]+\\.[0-9]+)" "\\1" CLANG_VERSION "${CLANG_VERSION_LONG}") - - # Required that LLVM/Clang version is >= 3.0 - IF (CLANG_VERSION VERSION_GREATER 3.0 OR CLANG_VERSION VERSION_EQUAL 3.0) - MESSAGE(STATUS "Found CLANG: ${CLANG_EXECUTABLE} (version ${CLANG_VERSION})") - ELSE() - MESSAGE(FATAL_ERROR "Necessary LLVM/Clang version not found (version >= 3.0 required)") - ENDIF() ELSE() MESSAGE(FATAL_ERROR "No LLVM/Clang compiler found (required for engine_c target)") ENDIF()