summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2022-10-14 01:31:31 +0200
committerSlávek Banko <slavek.banko@axis.cz>2022-10-14 01:31:52 +0200
commit50ca1633e6326f8e8c5292543aac02f625632180 (patch)
treeb632ebfb6defa66539fc5dbb9816de7a4435e832
parentba611a1d3e682aa5006e5f3b6dd4e3026ef96ad8 (diff)
downloadtdemultimedia-r14.0.13.tar.gz
tdemultimedia-r14.0.13.zip
Use TDE dummy.cpp file for consistency with other packages.r14.0.13r14.0.x
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit d02884d8409920e56c55f59a39651097b0932230)
-rw-r--r--kaboodle/CMakeLists.txt2
-rw-r--r--mpeglib/lib/CMakeLists.txt4
-rw-r--r--mpeglib/lib/Makefile.am2
-rw-r--r--mpeglib/lib/dummy.cpp6
-rw-r--r--tdemid/CMakeLists.txt2
5 files changed, 7 insertions, 9 deletions
diff --git a/kaboodle/CMakeLists.txt b/kaboodle/CMakeLists.txt
index 85cb017b..15680177 100644
--- a/kaboodle/CMakeLists.txt
+++ b/kaboodle/CMakeLists.txt
@@ -53,7 +53,7 @@ tde_add_kpart( libkaboodlepart AUTOMOC
DESTINATION ${PLUGIN_INSTALL_DIR}
)
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp "" )
+configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY )
##### kaboodle (executable) #####################
diff --git a/mpeglib/lib/CMakeLists.txt b/mpeglib/lib/CMakeLists.txt
index a2e324fe..ad500d03 100644
--- a/mpeglib/lib/CMakeLists.txt
+++ b/mpeglib/lib/CMakeLists.txt
@@ -37,7 +37,7 @@ link_directories(
##### mpeg-lib (library) ########################
tde_add_library( mpeg SHARED
- SOURCES dummy.cpp
+ SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dummy.cpp
RELEASE ${MPEGLIB_VERSION}
EMBED
mpeg_mpgplayer-static
@@ -66,3 +66,5 @@ tde_add_library( mpeg SHARED
pthread
DESTINATION ${LIB_INSTALL_DIR}
)
+
+configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake dummy.cpp COPYONLY )
diff --git a/mpeglib/lib/Makefile.am b/mpeglib/lib/Makefile.am
index 3c6d115e..142f302f 100644
--- a/mpeglib/lib/Makefile.am
+++ b/mpeglib/lib/Makefile.am
@@ -23,6 +23,8 @@ THIS_EXTRALIBS = mpgplayer/libmpgplayer.la \
frame/libframe.la \
yuv/libyuvPlugin.la
+dummy.cpp:
+ echo > dummy.cpp
lib_LTLIBRARIES = libmpeg.la
diff --git a/mpeglib/lib/dummy.cpp b/mpeglib/lib/dummy.cpp
deleted file mode 100644
index 94bd1cb7..00000000
--- a/mpeglib/lib/dummy.cpp
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-static int dummy() {
- return 0;
-}
diff --git a/tdemid/CMakeLists.txt b/tdemid/CMakeLists.txt
index 134a1992..2c90de95 100644
--- a/tdemid/CMakeLists.txt
+++ b/tdemid/CMakeLists.txt
@@ -53,7 +53,7 @@ tde_add_kpart( libtdemidpart AUTOMOC
DESTINATION ${PLUGIN_INSTALL_DIR}
)
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/part_dummy.cpp "" )
+configure_file( ${TDE_CMAKE_TEMPLATES}/tde_dummy_cpp.cmake part_dummy.cpp COPYONLY )
##### tdemid (executable) #######################