Control: reopen -1

Looks like upstream forgot that OGRE_GCC_VERSION (the CMake variable) is just the version, not multiplied by 100 like OGRE_COMP_VER (the C macro), so libatomic never gets enabled. Fix attached.
Fix version check for enabling libatomic: OGRE_COMP_VER (C macro) is multiplied by 100, OGRE_GCC_VERSION (CMake variable) isn't.
$ diff -up OgreMain/CMakeLists.txt_orig OgreMain/CMakeLists.txt
--- OgreMain/CMakeLists.txt_orig	2013-10-16 15:32:31.000000000 +0100
+++ OgreMain/CMakeLists.txt	2013-10-17 08:05:37.285790478 +0100
@@ -289,7 +289,7 @@ else()
   set_target_properties(OgreMain PROPERTIES VERSION ${OGRE_SOVERSION} SOVERSION ${OGRE_SOVERSION})
 endif()
 
-if(OGRE_GCC_VERSION GREATER 470)
+if(OGRE_GCC_VERSION VERSION_GREATER 4.7)#-dumpversion doesn't include the patch level, so this requires >= 4.8
   list(APPEND LIBRARIES "-latomic")
 endif()
 

Reply via email to