Issue: 993. Thank you Daniel for the patch. Two changes to the patch are explained in the Issue Report.

v0.27.3
Robin Mills 11 years ago
parent 7aa65c705d
commit cbdeb45387

@ -154,16 +154,15 @@ IF( ${EXV_HAVE_STDINT_H} )
ADD_DEFINITIONS( -DEXV_HAVE_STDINT_H ) ADD_DEFINITIONS( -DEXV_HAVE_STDINT_H )
ENDIF( ${EXV_HAVE_STDINT_H} ) ENDIF( ${EXV_HAVE_STDINT_H} )
ADD_SUBDIRECTORY( xmpsdk ) FIND_PACKAGE(Subversion QUIET)
ADD_SUBDIRECTORY( src ) SET(SVN_REVISION "0")
IF(SUBVERSION_FOUND)
IF( EXIV2_ENABLE_BUILD_SAMPLES ) IF(EXISTS "${CMAKE_SOURCE_DIR}/.svn")
ADD_SUBDIRECTORY( samples ) Subversion_WC_INFO(${PROJECT_SOURCE_DIR} svnExiv2)
ENDIF( EXIV2_ENABLE_BUILD_SAMPLES ) SET(SVN_REVISION "${svnExiv2_WC_REVISION}")
ENDIF()
IF( EXIV2_ENABLE_BUILD_PO ) ENDIF()
ADD_SUBDIRECTORY( po ) MESSAGE(STATUS "SVN version: ${SVN_REVISION}")
ENDIF( EXIV2_ENABLE_BUILD_PO )
IF( NOT MSVC ) IF( NOT MSVC )
# Issue #722: out of source builds compiled against standard include files such as /usr/local/lib/include/exiv2 # Issue #722: out of source builds compiled against standard include files such as /usr/local/lib/include/exiv2
@ -177,11 +176,19 @@ IF( NOT MSVC )
IF( EXIV2_ENABLE_BUILD_PO ) IF( EXIV2_ENABLE_BUILD_PO )
EXECUTE_PROCESS( WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/po COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/src exiv2) EXECUTE_PROCESS( WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/po COMMAND ln -sf ${CMAKE_CURRENT_SOURCE_DIR}/src exiv2)
ENDIF( EXIV2_ENABLE_BUILD_PO ) ENDIF( EXIV2_ENABLE_BUILD_PO )
MESSAGE(STATUS "generating ${CMAKE_CURRENT_SOURCE_DIR}/src/svn_version.h")
EXECUTE_PROCESS( WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src COMMAND ./svn_version.sh)
ENDIF() ENDIF()
ADD_SUBDIRECTORY( xmpsdk )
ADD_SUBDIRECTORY( src )
IF( EXIV2_ENABLE_BUILD_SAMPLES )
ADD_SUBDIRECTORY( samples )
ENDIF( EXIV2_ENABLE_BUILD_SAMPLES )
IF( EXIV2_ENABLE_BUILD_PO )
ADD_SUBDIRECTORY( po )
ENDIF( EXIV2_ENABLE_BUILD_PO )
## ##
# tests # tests
ADD_CUSTOM_TARGET(tests COMMAND make test "EXIV2_BINDIR=${CMAKE_BINARY_DIR}/bin" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test/" ) ADD_CUSTOM_TARGET(tests COMMAND make test "EXIV2_BINDIR=${CMAKE_BINARY_DIR}/bin" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/test/" )

@ -148,12 +148,19 @@ IF( EXIV2_ENABLE_PNG )
ENDIF( ZLIB_FOUND ) ENDIF( ZLIB_FOUND )
ENDIF( EXIV2_ENABLE_PNG ) ENDIF( EXIV2_ENABLE_PNG )
IF( NOT MSVC ) CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/svn_version.h.in
SET( LIBEXIV2_HDR ${LIBEXIV2_HDR} ${CMAKE_CURRENT_BINARY_DIR}/svn_version.h @ONLY)
svn_version.h
) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
IF( MSVC ) # to support the old VS solution builds
ADD_DEFINITIONS("-DCMAKE_BUILD_SVN")
ENDIF() ENDIF()
SET( LIBEXIV2_HDR ${LIBEXIV2_HDR}
svn_version.h
)
## ##
# add xmp source if xmp is requested and xmp library not built # add xmp source if xmp is requested and xmp library not built
IF( EXIV2_ENABLE_XMP ) IF( EXIV2_ENABLE_XMP )

@ -38,7 +38,7 @@
#include <string> #include <string>
// svn version has not been implemented yet for DevStudio // svn version has not been implemented yet for DevStudio
#if defined(_MSC_VER) #if defined(_MSC_VER) && !defined(CMAKE_BUILD_SVN)
#define SVN_VERSION 0 #define SVN_VERSION 0
#else #else
#include "svn_version.h" #include "svn_version.h"

Loading…
Cancel
Save