fixed the make file to include new location of CMakeLists.txt (src)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
new file mode 100644 (file)
index 0000000..8ccc914
--- /dev/null
+++ b/src/CMakeLists.txt
@@ -0,0 +1,51 @@
+cmake_minimum_required(VERSION 2.8.12)\r
+\r
+project(asdcplibmod)\r
+\r
+# The version number.\r
+set(VERSION_MAJOR 2)\r
+set(VERSION_MINOR 5)\r
+set(VERSION_PATCH 13)\r
+set(VERSION_STRING ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})\r
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)\r
+set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "Default Targets")\r
+# use, i.e. don't skip the full RPATH for the build tree\r
+set(CMAKE_SKIP_BUILD_RPATH  OFF)\r
+# when building, don't use the install RPATH already\r
+# (but later on when installing)\r
+set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF) \r
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")\r
+# add the automatically determined parts of the RPATH\r
+# which point to directories outside the build tree to the install RPATH\r
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)\r
+# the RPATH to be used when installing, but only if it's not a system directory\r
+list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)\r
+if("${isSystemDir}" STREQUAL "-1")\r
+   set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")\r
+endif("${isSystemDir}" STREQUAL "-1")\r
+\r
+# Configure a header file to pass some of the CMake settings to the source code.\r
+configure_file("${PROJECT_SOURCE_DIR}/src/info.in" "${PROJECT_BINARY_DIR}/src/info.h")\r
+\r
+# Add the binary tree to the search path for include files so that we will find info.h.\r
+include_directories("${PROJECT_BINARY_DIR}/src")\r
+add_subdirectory(src)\r
+\r
+set(CPACK_GENERATOR ZIP)\r
+if(UNIX)\r
+       set(CPACK_GENERATOR ${CPACK_GENERATOR};STGZ;TGZ)\r
+endif(UNIX)\r
+if(UNIX AND NOT APPLE)\r
+       set(CPACK_GENERATOR ${CPACK_GENERATOR};DEB;RPM)\r
+endif(UNIX AND NOT APPLE)\r
+set(CPACK_PACKAGE_NAME ${PROJECT_NAME})\r
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Modified asdcp lib. Can generate MXF resources.")\r
+set(CPACK_PACKAGE_VENDOR "HSRM")\r
+set(CPACK_PACKAGE_CONTACT "bjoern.stresing@gmx.de")\r
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")\r
+set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})\r
+set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})\r
+set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})\r
+set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)\r
+set(CPACK_PACKAGE_INSTALL_DIRECTORY ${PROJECT_NAME}{VERSION_MAJOR}.${VERSION_MINOR})\r
+include(CPack)\r

diff --git a/src/Makefile.am b/src/Makefile.am
index f903eb9282432dd433881d57e3c557dce18d786f..b91aba218c523086623bbae62be75de62e575315 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -119,7 +119,7 @@ libasdcp_la_SOURCES = MPEG2_Parser.cpp MPEG.cpp JP2K_Codestream_Parser.cpp \
        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 MDD.cpp \
-       AS_DCP_ATMOS.cpp  AS_DCP_DCData.cpp info.in\
+       AS_DCP_ATMOS.cpp  AS_DCP_DCData.cpp info.in \
        DCData_ByteStream_Parser.cpp DCData_Sequence_Parser.cpp \
        AtmosSyncChannel_Generator.cpp AtmosSyncChannel_Generator.h \
        AtmosSyncChannel_Mixer.cpp AtmosSyncChannel_Mixer.h \
@@ -337,7 +337,7 @@ TESTS_ENVIRONMENT = BUILD_DIR="." TEST_FILES=../tests TEST_FILE_PREFIX=DCPd1-M1
        JP2K_PREFIX=MM_2k_XYZ_
 
 # files to include in the distribution that automake doesn't automatically include
-EXTRA_DIST = fips-186-test-harness.pl $(TESTS) ../CMakeLists.txt
+EXTRA_DIST = fips-186-test-harness.pl $(TESTS) CMakeLists.txt
 if !FREEDIST
 if DEV_HEADERS
 EXTRA_DIST += $(nodist_libasdcp_la_SOURCES) $(nodist_tt_xform_SOURCES)