[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=59f0482

The following commit has been merged in the master branch:
commit 59f04827ecee4069c34615f78780f0172ec69888
Author: danielkaneider <kaneiderdaniel at gmail.com>
Date:   Sun Nov 1 18:01:31 2015 +0000

    [cmake] travis fixes for osx
---
 .travis.yml            | 14 ++++++++++++--
 config/CMakeChecks.txt |  6 ++++++
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index cbf0df3..da0af0e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,24 +7,34 @@ addons:
       packages:
         - cmake
         - zlib1g-dev
+        - libssh-dev
+        - libssh
+        - libcurl4-openssl-dev
+        - gettext
       sources:
         - kalakris-cmake
         
 compiler:
   - gcc
-# - clang
+  - clang
 
 before_install:
   - echo $LANG
   - echo $LC_ALL
   - rvm use $RVM --install --binary --fuzzy
   - gem update --system
+  - if [ $TRAVIS_OS_NAME == osx ]; then brew update && brew install libssh curl; fi
   - gem --version
 
 script:
   - cmake -DCMAKE_INSTALL_PREFIX=..\dist -EXIV2_ENABLE_NLS=ON -DEXIV2_ENABLE_CURL=OFF -DEXIV2_ENABLE_SSH=OFF .
   - cmake --build . && cmake --build . --target install 
+  - cmake -DCMAKE_INSTALL_PREFIX=..\dist2 -EXIV2_ENABLE_NLS=ON -DEXIV2_ENABLE_CURL=ON -DEXIV2_ENABLE_SSH=ON -DEXIV2_ENABLE_WEBREADY=ON .
+  - cmake --build . && cmake --build . --target install 
 
+notifications:
+  email: false
+  
 os:
   - linux
-# - osx
\ No newline at end of file
+  - osx
\ No newline at end of file
diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt
index 925665b..ebcddd6 100644
--- a/config/CMakeChecks.txt
+++ b/config/CMakeChecks.txt
@@ -95,6 +95,8 @@ ELSE( EXIV2_ENABLE_SHARED )
 ENDIF( EXIV2_ENABLE_SHARED )
 
 IF( EXIV2_ENABLE_NLS )
+    #FIND_PACKAGE(Intl REQUIRED)
+    #INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS})
     IF( NOT LOCALEDIR )
         SET( LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/locale" )
         IF( WIN32 )
@@ -185,6 +187,10 @@ return 0;
 }" TM_IN_SYS_TIME )
 ENDIF( HAVE_SYS_TIME_H )
 
+IF (NOT HAVE_LIBINTL_H)
+    SET(ENABLE_NLS 0)
+    SET(EXIV2_ENABLE_NLS 0)
+ENDIF()
 #####################################################################################
 # strerror_r returns char*
 

-- 
exiv2 packaging