From a7fecfde7807eb09fc369bbaea0a98d0abfa7e8c Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Sun, 10 Jun 2012 06:24:39 +0000
Subject: [PATCH] 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 f853f6ee..47536f9e 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 37b1b157..92831688 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))