xymp
/
exiv2
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake: fix gettext support

Browse Source 
Building exiv2 with uclibc and gettext fails currently as detected
by the buildroot autobuilders:
http://autobuild.buildroot.net/results/def/defcdd3dd57b031c31bb16c0075f079a482bf52d/build-end.log
v0.27.3
Bernd Kuhls 8 years ago
parent 5562d9c584
commit 3af0d1a6b2
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File

12
config/CMakeChecks.txt
Unescape Escape View File

@ -95,8 +95,16 @@ ELSE( EXIV2_ENABLE_SHARED )
ENDIF( EXIV2_ENABLE_SHARED ) ENDIF( EXIV2_ENABLE_SHARED )
IF( EXIV2_ENABLE_NLS ) IF( EXIV2_ENABLE_NLS )
#FIND_PACKAGE(Intl REQUIRED) FIND_PACKAGE(Intl)
#INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS}) if(Intl_FOUND)
INCLUDE_DIRECTORIES(${Intl_INCLUDE_DIRS})
find_library(LIBINTL_LIBRARY NAMES intl libintl)
if(libintl_FOUND)
SET(LIBINTL_LIBRARIES ${LIBINTL_LIBRARY})
else(libintl_FOUND)
SET(LIBINTL_LIBRARIES)
endif()
endif()
IF( NOT LOCALEDIR ) IF( NOT LOCALEDIR )
SET( LOCALEDIR "${CMAKE_INSTALL_LOCALEDIR}" ) SET( LOCALEDIR "${CMAKE_INSTALL_LOCALEDIR}" )
IF( WIN32 ) IF( WIN32 )

6
src/CMakeLists.txt
Unescape Escape View File

@ -316,13 +316,13 @@ msvc_runtime_configure(${EXIV2_ENABLE_SHARED} ${EXIV2_ENABLE_DYNAMIC_RUNTIME})
# ****************************************************************************** # ******************************************************************************
# exiv2 application # exiv2 application
ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ${EXIV2_HDR} ) ADD_EXECUTABLE( exiv2 ${EXIV2_SRC} ${EXIV2_HDR} )
TARGET_LINK_LIBRARIES( exiv2 exiv2lib ) TARGET_LINK_LIBRARIES( exiv2 exiv2lib ${LIBINTL_LIBRARIES} )
INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} ) INSTALL( TARGETS exiv2 ${INSTALL_TARGET_STANDARD_ARGS} )
# ****************************************************************************** # ******************************************************************************
# connection test application # connection test application
ADD_EXECUTABLE( conntest ${CONNTEST} ) ADD_EXECUTABLE( conntest ${CONNTEST} )
TARGET_LINK_LIBRARIES( conntest ${PRIVATE_VAR} exiv2lib ${CURL_LIBRARIES} ${SSH_LIBRARIES}) TARGET_LINK_LIBRARIES( conntest ${PRIVATE_VAR} exiv2lib ${CURL_LIBRARIES} ${SSH_LIBRARIES} ${LIBINTL_LIBRARIES} )
# ****************************************************************************** # ******************************************************************************
# exifprint application # exifprint application
@ -332,7 +332,7 @@ TARGET_LINK_LIBRARIES( conntest ${PRIVATE_VAR} exiv2lib ${CURL_LIBRARIES} ${SSH
# ****************************************************************************** # ******************************************************************************
# remotetest application # remotetest application
ADD_EXECUTABLE( remotetest ${REMOTETEST} ) ADD_EXECUTABLE( remotetest ${REMOTETEST} )
TARGET_LINK_LIBRARIES( remotetest exiv2lib ) TARGET_LINK_LIBRARIES( remotetest exiv2lib ${LIBINTL_LIBRARIES} )
# ****************************************************************************** # ******************************************************************************
# Headers # Headers

Write Preview
Loading…
Cancel
Save