Handle HAVE_LENSDATA variable in the new cmake file

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
+SET( EXV_SYMBOLS HAVE_LIBINTL_H
-                 HAVE_LIBINTL_H
                  HAVE_LIBZ
                  HAVE_MALLOC_H
                  HAVE_MEMORY_H

config/config.h.cmake

@@ -27,8 +27,8 @@
 
 #ifndef EXV_COMMERCIAL_VERSION
 
-/* Define to 1 to enable translation of Nikon lens names. */
+// Definition to enable translation of Nikon lens names.
-#cmakedefine EXV_HAVE_LENSDATA 1
+#cmakedefine EXV_HAVE_LENSDATA
 
 // Define to 1 if you have the `iconv' function.
 #cmakedefine EXV_HAVE_ICONV

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})