diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b9932d1..54b3f5bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,6 @@ option( EXIV2_ENABLE_PNG "Build with png support (requires libz)" option( EXIV2_ENABLE_NLS "Build native language support (requires gettext)" ON ) option( EXIV2_ENABLE_PRINTUCS2 "Build with Printucs2" ON ) option( EXIV2_ENABLE_LENSDATA "Build including lens data" ON ) -option( EXIV2_ENABLE_COMMERCIAL "Build with the EXV_COMMERCIAL_VERSION symbol set" OFF ) option( EXIV2_ENABLE_VIDEO "Build video support into library" OFF ) option( EXIV2_ENABLE_WEBREADY "Build webready support into library" OFF ) option( EXIV2_ENABLE_DYNAMIC_RUNTIME "Use dynamic runtime (used for static libs)" OFF ) @@ -53,11 +52,6 @@ if ( EXIV2_ENABLE_WEBREADY ) endif () endif() -if( EXIV2_ENABLE_COMMERCIAL ) - set (EXIV2_ENABLE_LENSDATA OFF) - set (EXIV2_ENABLE_NLS OFF) -endif() - if ( EXIV2_ENABLE_EXTERNAL_XMP ) set(EXIV2_ENABLE_XMP OFF) endif() diff --git a/cmake/CMakeChecks.txt b/cmake/CMakeChecks.txt index 6a4e2728..ddd55538 100644 --- a/cmake/CMakeChecks.txt +++ b/cmake/CMakeChecks.txt @@ -31,10 +31,6 @@ # # ConfigureChecks for exiv2 -if( EXIV2_ENABLE_COMMERCIAL ) - add_definitions( -DEXV_COMMERCIAL_VERSION ) -endif() - configure_file(cmake/exiv2_uninstall.cmake ${CMAKE_BINARY_DIR}/cmake_uninstall.cmake COPYONLY) add_custom_target(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_BINARY_DIR}/cmake_uninstall.cmake") diff --git a/cmake/printSummary.cmake b/cmake/printSummary.cmake index cba35783..107ac0e0 100644 --- a/cmake/printSummary.cmake +++ b/cmake/printSummary.cmake @@ -45,7 +45,6 @@ endif() OptionOutput( "Native language support: " EXIV2_ENABLE_NLS ) OptionOutput( "Conversion of Windows XP tags: " EXIV2_ENABLE_PRINTUCS2 ) OptionOutput( "Nikon lens database: " EXIV2_ENABLE_LENSDATA ) -OptionOutput( "Commercial build: " EXIV2_ENABLE_COMMERCIAL ) OptionOutput( "Building video support: " EXIV2_ENABLE_VIDEO ) OptionOutput( "Building webready support: " EXIV2_ENABLE_WEBREADY ) if ( EXIV2_ENABLE_WEBREADY ) diff --git a/contrib/cmake/msvc/ReadMe.txt b/contrib/cmake/msvc/ReadMe.txt index 9a5424e2..94cb706f 100755 --- a/contrib/cmake/msvc/ReadMe.txt +++ b/contrib/cmake/msvc/ReadMe.txt @@ -235,7 +235,6 @@ How to use this option( EXIV2_ENABLE_NLS "Build native language support (requires gettext)" ON ) option( EXIV2_ENABLE_PRINTUCS2 "Build with Printucs2" ON ) option( EXIV2_ENABLE_LENSDATA "Build including lens data" ON ) - option( EXIV2_ENABLE_COMMERCIAL "Build with the EXV_COMMERCIAL_VERSION symbol set" OFF ) option( EXIV2_ENABLE_VIDEO "Build video support into library" OFF ) option( EXIV2_ENABLE_WEBREADY "Build webready support into library" OFF ) option( EXIV2_ENABLE_DYNAMIC_RUNTIME "Use dynamic runtime (used for static libs)" OFF )