Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

CMake changes to support version 0.2.0

  • Loading branch information...
commit a30d3875fa8ebe13f4ba814e7760cf9e226b12a2 1 parent 33dec9d
@marefr marefr authored
View
12 CMakeLists.txt
@@ -1,7 +1,7 @@
SET(LIBDVBLINKREMOTE_COPYRIGHT "2012 Marcus Efraimsson")
SET(LIBDVBLINKREMOTE_VERSION_MAJOR 0)
-SET(LIBDVBLINKREMOTE_VERSION_MINOR 1)
-SET(LIBDVBLINKREMOTE_VERSION_PATCH 1)
+SET(LIBDVBLINKREMOTE_VERSION_MINOR 2)
+SET(LIBDVBLINKREMOTE_VERSION_PATCH 0)
SET(LIBDVBLINKREMOTE_VERSION ${LIBDVBLINKREMOTE_VERSION_MAJOR}.${LIBDVBLINKREMOTE_VERSION_MINOR}.${LIBDVBLINKREMOTE_VERSION_PATCH})
SET(LIBDVBLINKREMOTE_RELEASE_NAME "Master")
SET(DVBLINKREMOTE_LIBRARY_NAME "libdvblinkremote")
@@ -118,13 +118,6 @@ SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${DVBLINKREMOTE_OUTPUT_DIRECTORY}/${DVBLINKR
FILE(WRITE ${DVBLINKREMOTE_OUTPUT_DIRECTORY}/${DVBLINKREMOTE_BIN_SUBDIR}/path.txt "${CMAKE_SOURCE_DIR}\n${DVBLINKREMOTE_OUTPUT_DIRECTORY}")
#############################################################
-# create version.h
-# installed with app target
-
-CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake_templates/version.h.in ${CMAKE_BINARY_DIR}/version.h)
-INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
-
-#############################################################
# process subdirs
ADD_SUBDIRECTORY(dvblinkremote)
@@ -135,7 +128,6 @@ ADD_SUBDIRECTORY(doc)
# install license file
INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/COPYING" DESTINATION .)
-
#############################################################
# Enable packaging
View
2  cmake_templates/Doxyfile.in
@@ -670,7 +670,9 @@ INPUT = @CMAKE_SOURCE_DIR@/doc/mainpage.dox \
@CMAKE_SOURCE_DIR@/libdvblinkremotesrc/version.h \
@CMAKE_SOURCE_DIR@/libdvblinkremote/src/request.h \
@CMAKE_SOURCE_DIR@/libdvblinkremote/src/response.h \
+ @CMAKE_SOURCE_DIR@/libdvblinkremote/src/scheduling.h \
@CMAKE_SOURCE_DIR@/libdvblinkremote/src/dvblinkremotehttp.h \
+ @CMAKE_SOURCE_DIR@/libdvblinkremote/src/dvblinkremoteserialization.h \
@CMAKE_SOURCE_DIR@/libdvblinkremote/src/version.h
# This tag can be used to specify the character encoding of the source files
View
41 libdvblinkremote/src/CMakeLists.txt
@@ -1,36 +1,36 @@
+#############################################################
+# create version.h
+
+CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake_templates/version.h.in ${CMAKE_CURRENT_SOURCE_DIR}/version.h)
#############################################################
# sources
SET(LIBDVBLINKREMOTE_SOURCES
- add_manual_schedule_request.cpp
- add_schedule_by_epg_request.cpp
- add_schedule_request.cpp
- add_schedule_request_serializer.cpp
channel.cpp
dvblinkremote.cpp
dvblinkremotecommunication.cpp
dvblinkremotehttp.cpp
- epg.cpp
+ epg.cpp
generic_response.cpp
- get_recordings_request.cpp
- http_live_stream_request.cpp
- parental_lock.cpp
+ item_metadata.cpp
+ parental_lock.cpp
+ playback_container.cpp
+ playback_item.cpp
+ playback_object.cpp
program.cpp
- raw_http_stream_request.cpp
- raw_udp_stream_request.cpp
- recording.cpp
- remove_recording_request.cpp
- remove_schedule_request.cpp
- rtp_stream_request.cpp
+ recording.cpp
+ recording_settings.cpp
+ remove_playback_object_request.cpp
+ scheduling.cpp
stop_stream_request.cpp
- stream.cpp stream_request.cpp
- stream_request_serializer.cpp
+ stream.cpp
+ stream_request.cpp
+ streaming_capabilities.cpp
transcoded_video_stream_request.cpp
transcoding_options.cpp
util.cpp
- windows_media_stream_request.cpp
- xml_object_serializer.cpp
+ xml_object_serializer_factory.cpp
)
#############################################################
@@ -40,9 +40,11 @@ SET(LIBDVBLINKREMOTE_SOURCES
SET(LIBDVBLINKREMOTE_PUBL_HEADERS
dvblinkremote.h
dvblinkremotehttp.h
+ dvblinkremoteserialization.h
request.h
response.h
- ${CMAKE_BINARY_DIR}/version.h
+ scheduling.h
+ version.h
)
IF(WITH_CURL AND CURL_FOUND)
@@ -67,6 +69,7 @@ SET(LIBDVBLINKREMOTE_INT_HEADERS
dvblinkremoteconnection.h
generic_response.h
util.h
+ xml_object_serializer.h
)
INCLUDE_DIRECTORIES(
Please sign in to comment.
Something went wrong with that request. Please try again.