diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt index 185216b4..0f810132 100644 --- a/config/CMakeChecks.txt +++ b/config/CMakeChecks.txt @@ -44,7 +44,6 @@ INCLUDE( FindIconv ) SET( STDC_HEADERS ON ) SET( HAVE_PRINTUCS2 ${EXIV2_ENABLE_PRINTUCS2} ) -SET( HAVE_LENSDATA ${EXIV2_ENABLE_LENSDATA} ) INCLUDE_DIRECTORIES( ${CMAKE_INCLUDE_PATH} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/xmpsdk/include ) LINK_DIRECTORIES( ${CMAKE_LIBRARY_PATH} ) @@ -128,8 +127,7 @@ IF( NOT MSVC ) SET( HAVE_PID_T TRUE ) ENDIF( NOT MSVC ) -SET( EXV_SYMBOLS HAVE_LENSDATA - HAVE_LIBINTL_H +SET( EXV_SYMBOLS HAVE_LIBINTL_H HAVE_LIBZ HAVE_MALLOC_H HAVE_MEMORY_H diff --git a/config/config.h.cmake b/config/config.h.cmake index 1150804f..934cc75f 100644 --- a/config/config.h.cmake +++ b/config/config.h.cmake @@ -27,8 +27,8 @@ #ifndef EXV_COMMERCIAL_VERSION -/* Define to 1 to enable translation of Nikon lens names. */ -#cmakedefine EXV_HAVE_LENSDATA 1 +// Definition to enable translation of Nikon lens names. +#cmakedefine EXV_HAVE_LENSDATA // Define to 1 if you have the `iconv' function. #cmakedefine EXV_HAVE_ICONV diff --git a/config/generateConfigFile.cmake b/config/generateConfigFile.cmake index 812306c0..c50bddcf 100644 --- a/config/generateConfigFile.cmake +++ b/config/generateConfigFile.cmake @@ -5,6 +5,7 @@ if (${EXIV2_ENABLE_WEBREADY}) endif() set(EXV_ENABLE_VIDEO ${EXIV2_ENABLE_VIDEO}) set(EXV_ENABLE_WEBREADY ${EXIV2_ENABLE_WEBREADY}) +set(EXV_HAVE_LENSDATA ${EXIV2_ENABLE_LENSDATA}) set(EXV_PACKAGE ${PACKAGE}) set(EXV_PACKAGE_VERSION ${PACKAGE_VERSION})