GCI2012: Check for Clang Version in CMake webgl
authorkoda
Sat, 01 Dec 2012 04:39:31 +0100
branchwebgl
changeset 8114 2816919ea74d
parent 8111 4307de8780fa (diff)
parent 8108 39d7a16ce60c (current diff)
child 8116 d24257910f8d
GCI2012: Check for Clang Version in CMake
--- a/CMakeLists.txt	Fri Nov 30 20:04:15 2012 -0600
+++ b/CMakeLists.txt	Sat Dec 01 04:39:31 2012 +0100
@@ -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
--- a/cmake_modules/FindClang.cmake	Fri Nov 30 20:04:15 2012 -0600
+++ b/cmake_modules/FindClang.cmake	Sat Dec 01 04:39:31 2012 +0100
@@ -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()
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/share/hedgewars/Data/misc/hwengine.desktop	Sat Dec 01 04:39:31 2012 +0100
@@ -0,0 +1,26 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Encoding=UTF-8
+Name=Hedgewars Engine
+GenericName=Hedgewars engine, for playback of saves and demos
+GenericName[de]=Hedgewars engine, für die Wiedergabe von gespeicherten Spielen und Demos
+GenericName[es]=Motor del juego Hedgewars, reproduce demos y partidas guardadas
+GenericName[fr]=Moteur graphique d'Hedgewars, pour revoir les parties enregistrées et de démonstration.
+GenericName[it]=Motore grafico di Hedgewars, riproduce le demo e riprende le partite salvate
+GenericName[ko]=헤즈와즈 게임 엔진, 데모 와 저장한 게임을 재생함
+GenericName[pl]=Silnik gry Hedgewars do odtwarzania dem i zapisów gier
+GenericName[pt]=Motor de jogo Hedgewars, para reprodução de jogos guardados e demos
+GenericName[ru]=Движок Hedgewars для проигрывания сохранённых игр и демок
+GenericName[sk]=Engine hry Hedgewars, pre prehrávanie uložených hier a demo súborov
+GenericName[cs]=Engine hry Hedgewars pro přehrávání uložených her a ukázkových souborů
+GenericName[sv]=Hedgewarsmotorn, för att öppna demo- och sparfiler
+GenericName[da]=Kæmpende Pindsvin
+Icon=hedgewars.png
+Exec=/usr/local/bin/hwengine /usr/local/share//hedgewars/Data %f
+Path=/tmp
+Terminal=false
+StartupNotify=false
+NoDisplay=true
+Categories=Application;Game;StrategyGame;
+MimeType=application/x-hedgewars-demo;application/x-hedgewars-save