[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=dbb75ea

The following commit has been merged in the master branch:
commit dbb75ead90cf6ea6191a43d06f6de81005b0b0f8
Author: Robin Mills <robin at clanmills.com>
Date:   Mon Sep 23 10:58:43 2013 +0000

    Issue: 920.  Do not enforce gcc compiler on Apple platforms for CMake builds.
---
 CMakeLists.txt    | 8 --------
 src/rcsid_int.hpp | 2 +-
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76d17dd..e4a946d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,14 +7,6 @@
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 ##
-# Issue:#857.  Use g++ instead of c++ (clang) compiler to eliminate warnings
-if (APPLE)
-    set(CMAKE_C_COMPILER gcc)
-    set(CMAKE_CXX_COMPILER g++)
-endif(APPLE)
-##
-
-##
 # Running cmake in a tree in which we have run ./configure ; make 
 # creates src/exv_conf.h which conflicts with cmake's own exv_conf.h
 # This causes incorrect compilation and linking errors.
diff --git a/src/rcsid_int.hpp b/src/rcsid_int.hpp
index 973f3f5..3e2f14f 100644
--- a/src/rcsid_int.hpp
+++ b/src/rcsid_int.hpp
@@ -53,7 +53,7 @@
 
  */
 
-#if defined(__GNUG__) || defined(__GNUC__) || defined (_MSC_VER)
+#if (defined(__GNUG__) || defined(__GNUC__) || defined (_MSC_VER))  && ! defined(__clang__)
 #define EXIV2_RCSID(id) \
     namespace { \
         inline const char* getRcsId(const char*) { return id ; } \

-- 
exiv2 packaging