[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=a7fecfd

The following commit has been merged in the master branch:
commit a7fecfde7807eb09fc369bbaea0a98d0abfa7e8c
Author: Robin Mills <robin at clanmills.com>
Date:   Sun Jun 10 06:24:39 2012 +0000

    cmake work in progress
---
 CMakeLists.txt         | 4 ++--
 samples/CMakeLists.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f853f6e..47536f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,7 +58,7 @@ if( MSVC )
 	endif()
 	
     if ( NOT EXPAT_LIBRARY  )
-		# link dependant libraries
+		# link dependent libraries
     	if (OUT_OF_SOURCE)
     		set(EXPAT_LIBRARY      ../../../${E}/$(ConfigurationName)/expat)
     		set(ZLIB_LIBRARY       ../../../${Z}/$(ConfigurationName)/zlib )
@@ -70,7 +70,7 @@ if( MSVC )
     		set(EXPAT_INCLUDE_DIR  ../${E}/lib )
     		set(ZLIB_INCLUDE_DIR   ../${Z}     )
     	endif()
-    	include_directories( ${EXPAT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ../msvc64/include ../../msvc64/include $(SolutionDir)\src\include)
+    	include_directories( ${EXPAT_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} msvc64\include src\include)
 	endif()
 	
 	if ( EXIV2_ENABLE_SHARED )
diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt
index 37b1b15..9283168 100644
--- a/samples/CMakeLists.txt
+++ b/samples/CMakeLists.txt
@@ -8,7 +8,7 @@
 if (MSVC)
 	include(../CMake_msvc.txt)
 	msvc_runtime_configure(${EXIV2_ENABLE_SHARED})
-	include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../include ${CMAKE_CURRENT_SOURCE_DIR}/../msvc64/include )
+	# include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../include ${CMAKE_CURRENT_SOURCE_DIR}/../msvc64/include )
 	
 	if ( NOT EXIV2_ENABLE_SHARED )		
 	#	link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../../zlib-1.2.7/$(ConfigurationName))

-- 
exiv2 packaging