5 files changed, 79 insertions, 58 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8ccc914..3c20140 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,51 +1,51 @@
-cmake_minimum_required(VERSION 2.8.12)
-
-project(asdcplibmod)
-
-# The version number.
-set(VERSION_MAJOR 2)
-set(VERSION_MINOR 5)
-set(VERSION_PATCH 13)
-set(VERSION_STRING ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "Default Targets")
-# use, i.e. don't skip the full RPATH for the build tree
-set(CMAKE_SKIP_BUILD_RPATH  OFF)
-# when building, don't use the install RPATH already
-# (but later on when installing)
-set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) 
-set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-# add the automatically determined parts of the RPATH
-# which point to directories outside the build tree to the install RPATH
-set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
-# the RPATH to be used when installing, but only if it's not a system directory
-list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
-if("${isSystemDir}" STREQUAL "-1")
-   set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-endif("${isSystemDir}" STREQUAL "-1")
-
-# Configure a header file to pass some of the CMake settings to the source code.
-configure_file("${PROJECT_SOURCE_DIR}/src/info.in" "${PROJECT_BINARY_DIR}/src/info.h")
-
-# Add the binary tree to the search path for include files so that we will find info.h.
-include_directories("${PROJECT_BINARY_DIR}/src")
-add_subdirectory(src)
-
-set(CPACK_GENERATOR ZIP)
-if(UNIX)
-	set(CPACK_GENERATOR ${CPACK_GENERATOR};STGZ;TGZ)
-endif(UNIX)
-if(UNIX AND NOT APPLE)
-	set(CPACK_GENERATOR ${CPACK_GENERATOR};DEB;RPM)
-endif(UNIX AND NOT APPLE)
-set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Modified asdcp lib. Can generate MXF resources.")
-set(CPACK_PACKAGE_VENDOR "HSRM")
-set(CPACK_PACKAGE_CONTACT "bjoern.stresing@gmx.de")
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
-set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
-set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
-set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
-set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-set(CPACK_PACKAGE_INSTALL_DIRECTORY ${PROJECT_NAME}{VERSION_MAJOR}.${VERSION_MINOR})
-include(CPack)
+cmake_minimum_required(VERSION 2.8.12)
+
+project(asdcplib)
+
+# The version number.
+set(VERSION_MAJOR 2)
+set(VERSION_MINOR 5)
+set(VERSION_PATCH 14)
+set(VERSION_STRING ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "Default Targets")
+# use, i.e. don't skip the full RPATH for the build tree
+set(CMAKE_SKIP_BUILD_RPATH  OFF)
+# when building, don't use the install RPATH already
+# (but later on when installing)
+set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) 
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+# add the automatically determined parts of the RPATH
+# which point to directories outside the build tree to the install RPATH
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
+# the RPATH to be used when installing, but only if it's not a system directory
+list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
+if("${isSystemDir}" STREQUAL "-1")
+   set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+endif("${isSystemDir}" STREQUAL "-1")
+
+# Configure a header file to pass some of the CMake settings to the source code.
+configure_file("${PROJECT_SOURCE_DIR}/src/info.in" "${PROJECT_BINARY_DIR}/src/info.h")
+
+# Add the binary tree to the search path for include files so that we will find info.h.
+include_directories("${PROJECT_BINARY_DIR}/src")
+add_subdirectory(src)
+
+set(CPACK_GENERATOR ZIP)
+if(UNIX)
+	set(CPACK_GENERATOR ${CPACK_GENERATOR};STGZ;TGZ)
+endif(UNIX)
+if(UNIX AND NOT APPLE)
+	set(CPACK_GENERATOR ${CPACK_GENERATOR};DEB;RPM)
+endif(UNIX AND NOT APPLE)
+set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "asdcplib from cinecert.com")
+set(CPACK_PACKAGE_VENDOR "CineCert LLC")
+set(CPACK_PACKAGE_CONTACT "asdcplib@cinecert.com")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
+set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+set(CPACK_PACKAGE_INSTALL_DIRECTORY ${PROJECT_NAME}{VERSION_MAJOR}.${VERSION_MINOR})
+include(CPack)
diff --git a/README b/README
index e820282..a2e0026 100755
--- a/README
+++ b/README
@@ -151,7 +151,7 @@ command-line utilities all respond to -h.
 
 Change History
 
-2016-05-06 - bug fixes, 2.5.13
+2016-05-06 - bug fixes, 2.5.14
 
  o Release 2.5.12 caused two problems with Atoms and DTS-X wrapping that are
    addressed by this release. The UL values that were changed to correct the
@@ -175,10 +175,12 @@ Change History
     initialized with a value of zero (0), such as GenericPictureEssenceDescriptor
     ::SignalStandard, GenericPictureEssenceDescriptor::SampledXOffset(0), etc.
   o Added higher edit rates (96, 100, 120) to the cinema TimedText_Parser
- o New files:
-     src/info.in
- o Removed files:
-     AS_DCP_DCData_internal.h
+
+  o Defined bool ASDCP::UL::operator<(const UL& rhs) const, which is needed to
+    carry out the version-insensitive lookup policy when searching for ULs in a
+    std::map<> of UL entries.
+  o New files:  src/info.in src/CMakeLists.txt
+  o Removed filess:  AS_DCP_DCData_internal.h
 
 
 2016-03-17 - bug fixes, 2.5.12
diff --git a/README.cmake b/README.cmake
new file mode 100644
index 0000000..a550136
--- /dev/null
+++ b/README.cmake
@@ -0,0 +1,19 @@
+**General**
+As an alternative to configure (autotools), cmake build system files are provided.
+In order to use them, you will need to install Cmake binaries on your system, or build Cmake from source.
+Note: Cmake 2.8.12 or higher is required.
+
+**Configuration**
+Linux / MacOS:
+$ mkdir build
+$ cd build/
+$ cmake ..
+See man cmake for additional options.
+
+**Build/Install**
+make && sudo make install
+will install in /usr/local/ as usual, in addition cmake target information will be installed in /usr/local/targets/
+
+Wolfgang Ruppel 2016-04-20
+
+
diff --git a/configure.ac b/configure.ac
index bedb51a..201348e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ AC_PREREQ([2.59])
 # For example, if asdcplib version 1.0.0 were modified to accomodate changes
 # in file format, and if no changes were made to AS_DCP.h, the new version would be
 # 1.0.1. If changes were also required in AS_DCP.h, the new version would be 1.1.1.
-AC_INIT([asdcplib], [2.5.13], [asdcplib@cinecert.com])
+AC_INIT([asdcplib], [2.5.14b], [asdcplib@cinecert.com])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/KM_error.h])
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 259989b..614485e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,7 +31,7 @@ set(asdcp_deploy_header AS_DCP.h PCMParserList.h AS_DCP_internal.h KM_error.h KM
 
 # header
 set(asdcp_src ${asdcp_src} Wav.h WavFileWriter.h MXF.h Metadata.h JP2K.h AS_DCP.h AS_DCP_internal.h KLV.h MPEG.h MXFTypes.h MDD.h
-	PCMParserList.h S12MTimecode.h AS_DCP_DCData_internal.h AtmosSyncChannel_Generator.h AtmosSyncChannel_Mixer.h PCMDataProviders.h
+	PCMParserList.h S12MTimecode.h AtmosSyncChannel_Generator.h AtmosSyncChannel_Mixer.h PCMDataProviders.h
 	SyncEncoder.h SyncCommon.h CRC16.h UUIDInformation.h
 )