From: <yu...@us...> - 2008-11-18 06:12:55
|
Revision: 3558 http://hugin.svn.sourceforge.net/hugin/?rev=3558&view=rev Author: yuv Date: 2008-11-18 06:12:52 +0000 (Tue, 18 Nov 2008) Log Message: ----------- find exiv2 either in the old Windows SDK (0.16) or in the generic folder exiv2 if built from source Modified Paths: -------------- hugin/trunk/CMakeModules/FindExiv2.cmake Modified: hugin/trunk/CMakeModules/FindExiv2.cmake =================================================================== --- hugin/trunk/CMakeModules/FindExiv2.cmake 2008-11-17 22:34:55 UTC (rev 3557) +++ hugin/trunk/CMakeModules/FindExiv2.cmake 2008-11-18 06:12:52 UTC (rev 3558) @@ -67,10 +67,11 @@ endif (EXIV2_FOUND) else(NOT WIN32) - FIND_PATH(EXIV2_INCLUDE_DIR exiv2/exiv2.hpp + FIND_PATH(EXIV2_INCLUDE_DIR exiv2/exif.hpp /usr/local/include /usr/include - ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/include + $(SOURCE_BASE_DIR)/exiv2/msvc/include + $(SOURCE_BASE_DIR)/exiv2-0.16/msvc/include ) include(FindLibraryWithDebug) @@ -78,13 +79,13 @@ find_library_with_debug(EXIV2_LIBRARIES WIN32_DEBUG_POSTFIX d NAMES exiv2 libexiv2 - PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib + PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ) find_library_with_debug(EXIV2EXPAT_LIBRARIES WIN32_DEBUG_POSTFIX d NAMES libexpat - PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib + PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ) SET(EXIV2_LIBRARIES ${EXIV2_LIBRARIES} ${EXIV2EXPAT_LIBRARIES}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2008-11-18 14:05:00
|
Revision: 3560 http://hugin.svn.sourceforge.net/hugin/?rev=3560&view=rev Author: yuv Date: 2008-11-18 14:04:49 +0000 (Tue, 18 Nov 2008) Log Message: ----------- typo Modified Paths: -------------- hugin/trunk/CMakeModules/FindExiv2.cmake Modified: hugin/trunk/CMakeModules/FindExiv2.cmake =================================================================== --- hugin/trunk/CMakeModules/FindExiv2.cmake 2008-11-18 13:17:54 UTC (rev 3559) +++ hugin/trunk/CMakeModules/FindExiv2.cmake 2008-11-18 14:04:49 UTC (rev 3560) @@ -70,8 +70,8 @@ FIND_PATH(EXIV2_INCLUDE_DIR exiv2/exif.hpp /usr/local/include /usr/include - $(SOURCE_BASE_DIR)/exiv2/msvc/include - $(SOURCE_BASE_DIR)/exiv2-0.16/msvc/include + ${SOURCE_BASE_DIR}/exiv2/msvc/include + ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/include ) include(FindLibraryWithDebug) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tm...@us...> - 2009-07-27 05:20:20
|
Revision: 4108 http://hugin.svn.sourceforge.net/hugin/?rev=4108&view=rev Author: tmodes Date: 2009-07-27 05:20:06 +0000 (Mon, 27 Jul 2009) Log Message: ----------- Updated CMake file for Exiv2-0.18.2 Modified Paths: -------------- hugin/trunk/CMakeModules/FindExiv2.cmake Modified: hugin/trunk/CMakeModules/FindExiv2.cmake =================================================================== --- hugin/trunk/CMakeModules/FindExiv2.cmake 2009-07-27 00:52:56 UTC (rev 4107) +++ hugin/trunk/CMakeModules/FindExiv2.cmake 2009-07-27 05:20:06 UTC (rev 4108) @@ -74,6 +74,7 @@ ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/include ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/include ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/include + ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/include ) include(FindLibraryWithDebug) @@ -81,13 +82,13 @@ find_library_with_debug(EXIV2_LIBRARIES WIN32_DEBUG_POSTFIX d NAMES exiv2 libexiv2 - PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib + PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib ) find_library_with_debug(EXIV2EXPAT_LIBRARIES WIN32_DEBUG_POSTFIX d NAMES libexpat - PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib + PATHS /usr/lib /usr/local/lib ${SOURCE_BASE_DIR}/exiv2/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.16/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.1/msvc/lib ${SOURCE_BASE_DIR}/exiv2-0.18.2/msvc/lib ) SET(EXIV2_LIBRARIES ${EXIV2_LIBRARIES} ${EXIV2EXPAT_LIBRARIES}) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |