Skip to content

Commit 333acf8

Browse files
mschroffelmschroffel
mschroffel
authored and
mschroffel
committed
wolfgang update cmake files + version bump
1 parent 2b10147 commit 333acf8

File tree

5 files changed

+79
-58
lines changed

5 files changed

+79
-58
lines changed

‎CMakeLists.txt

+51-51
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
1-
cmake_minimum_required(VERSION 2.8.12)
2-
3-
project(asdcplibmod)
4-
5-
# The version number.
6-
set(VERSION_MAJOR 2)
7-
set(VERSION_MINOR 5)
8-
set(VERSION_PATCH 13)
9-
set(VERSION_STRING ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
10-
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
11-
set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "Default Targets")
12-
# use, i.e. don't skip the full RPATH for the build tree
13-
set(CMAKE_SKIP_BUILD_RPATH OFF)
14-
# when building, don't use the install RPATH already
15-
# (but later on when installing)
16-
set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF)
17-
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
18-
# add the automatically determined parts of the RPATH
19-
# which point to directories outside the build tree to the install RPATH
20-
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
21-
# the RPATH to be used when installing, but only if it's not a system directory
22-
list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
23-
if("${isSystemDir}" STREQUAL "-1")
24-
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
25-
endif("${isSystemDir}" STREQUAL "-1")
26-
27-
# Configure a header file to pass some of the CMake settings to the source code.
28-
configure_file("${PROJECT_SOURCE_DIR}/src/info.in" "${PROJECT_BINARY_DIR}/src/info.h")
29-
30-
# Add the binary tree to the search path for include files so that we will find info.h.
31-
include_directories("${PROJECT_BINARY_DIR}/src")
32-
add_subdirectory(src)
33-
34-
set(CPACK_GENERATOR ZIP)
35-
if(UNIX)
36-
set(CPACK_GENERATOR ${CPACK_GENERATOR};STGZ;TGZ)
37-
endif(UNIX)
38-
if(UNIX AND NOT APPLE)
39-
set(CPACK_GENERATOR ${CPACK_GENERATOR};DEB;RPM)
40-
endif(UNIX AND NOT APPLE)
41-
set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
42-
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Modified asdcp lib. Can generate MXF resources.")
43-
set(CPACK_PACKAGE_VENDOR "HSRM")
44-
set(CPACK_PACKAGE_CONTACT "bjoern.stresing@gmx.de")
45-
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
46-
set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
47-
set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
48-
set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
49-
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
50-
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${PROJECT_NAME}{VERSION_MAJOR}.${VERSION_MINOR})
51-
include(CPack)
1+
cmake_minimum_required(VERSION 2.8.12)
2+
3+
project(asdcplib)
4+
5+
# The version number.
6+
set(VERSION_MAJOR 2)
7+
set(VERSION_MINOR 5)
8+
set(VERSION_PATCH 14)
9+
set(VERSION_STRING ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
10+
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
11+
set_property(GLOBAL PROPERTY PREDEFINED_TARGETS_FOLDER "Default Targets")
12+
# use, i.e. don't skip the full RPATH for the build tree
13+
set(CMAKE_SKIP_BUILD_RPATH OFF)
14+
# when building, don't use the install RPATH already
15+
# (but later on when installing)
16+
set(CMAKE_BUILD_WITH_INSTALL_RPATH OFF)
17+
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
18+
# add the automatically determined parts of the RPATH
19+
# which point to directories outside the build tree to the install RPATH
20+
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH ON)
21+
# the RPATH to be used when installing, but only if it's not a system directory
22+
list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
23+
if("${isSystemDir}" STREQUAL "-1")
24+
set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
25+
endif("${isSystemDir}" STREQUAL "-1")
26+
27+
# Configure a header file to pass some of the CMake settings to the source code.
28+
configure_file("${PROJECT_SOURCE_DIR}/src/info.in" "${PROJECT_BINARY_DIR}/src/info.h")
29+
30+
# Add the binary tree to the search path for include files so that we will find info.h.
31+
include_directories("${PROJECT_BINARY_DIR}/src")
32+
add_subdirectory(src)
33+
34+
set(CPACK_GENERATOR ZIP)
35+
if(UNIX)
36+
set(CPACK_GENERATOR ${CPACK_GENERATOR};STGZ;TGZ)
37+
endif(UNIX)
38+
if(UNIX AND NOT APPLE)
39+
set(CPACK_GENERATOR ${CPACK_GENERATOR};DEB;RPM)
40+
endif(UNIX AND NOT APPLE)
41+
set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
42+
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "asdcplib from cinecert.com")
43+
set(CPACK_PACKAGE_VENDOR "CineCert LLC")
44+
set(CPACK_PACKAGE_CONTACT "asdcplib@cinecert.com")
45+
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
46+
set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
47+
set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
48+
set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
49+
set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
50+
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${PROJECT_NAME}{VERSION_MAJOR}.${VERSION_MINOR})
51+
include(CPack)

‎README

+7-5
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ command-line utilities all respond to -h.
151151

152152
Change History
153153

154-
2016-05-06 - bug fixes, 2.5.13
154+
2016-05-06 - bug fixes, 2.5.14
155155

156156
o Release 2.5.12 caused two problems with Atoms and DTS-X wrapping that are
157157
addressed by this release. The UL values that were changed to correct the
@@ -175,10 +175,12 @@ Change History
175175
initialized with a value of zero (0), such as GenericPictureEssenceDescriptor
176176
::SignalStandard, GenericPictureEssenceDescriptor::SampledXOffset(0), etc.
177177
o Added higher edit rates (96, 100, 120) to the cinema TimedText_Parser
178-
o New files:
179-
src/info.in
180-
o Removed files:
181-
AS_DCP_DCData_internal.h
178+
179+
o Defined bool ASDCP::UL::operator<(const UL& rhs) const, which is needed to
180+
carry out the version-insensitive lookup policy when searching for ULs in a
181+
std::map<> of UL entries.
182+
o New files: src/info.in src/CMakeLists.txt
183+
o Removed filess: AS_DCP_DCData_internal.h
182184

183185

184186
2016-03-17 - bug fixes, 2.5.12

‎README.cmake

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
**General**
2+
As an alternative to configure (autotools), cmake build system files are provided.
3+
In order to use them, you will need to install Cmake binaries on your system, or build Cmake from source.
4+
Note: Cmake 2.8.12 or higher is required.
5+
6+
**Configuration**
7+
Linux / MacOS:
8+
$ mkdir build
9+
$ cd build/
10+
$ cmake ..
11+
See man cmake for additional options.
12+
13+
**Build/Install**
14+
make && sudo make install
15+
will install in /usr/local/ as usual, in addition cmake target information will be installed in /usr/local/targets/
16+
17+
Wolfgang Ruppel 2016-04-20
18+
19+

‎configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ AC_PREREQ([2.59])
3737
# For example, if asdcplib version 1.0.0 were modified to accomodate changes
3838
# in file format, and if no changes were made to AS_DCP.h, the new version would be
3939
# 1.0.1. If changes were also required in AS_DCP.h, the new version would be 1.1.1.
40-
AC_INIT([asdcplib], [2.5.13], [asdcplib@cinecert.com])
40+
AC_INIT([asdcplib], [2.5.14b], [asdcplib@cinecert.com])
4141

4242
AC_CONFIG_AUX_DIR([build-aux])
4343
AC_CONFIG_SRCDIR([src/KM_error.h])

‎src/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ set(asdcp_deploy_header AS_DCP.h PCMParserList.h AS_DCP_internal.h KM_error.h KM
3131

3232
# header
3333
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
34-
PCMParserList.h S12MTimecode.h AS_DCP_DCData_internal.h AtmosSyncChannel_Generator.h AtmosSyncChannel_Mixer.h PCMDataProviders.h
34+
PCMParserList.h S12MTimecode.h AtmosSyncChannel_Generator.h AtmosSyncChannel_Mixer.h PCMDataProviders.h
3535
SyncEncoder.h SyncCommon.h CRC16.h UUIDInformation.h
3636
)
3737

0 commit comments

Comments
 (0)