From ff8376b9d27749e17d946f43447ac512612b1cb3 Mon Sep 17 00:00:00 2001 From: "Joshua M. Doe" Date: Thu, 3 Aug 2017 10:14:49 -0400 Subject: [PATCH] build: use git version info in plugins and build ZIP package --- CMakeLists.txt | 23 +++- cmake/modules/GetGitRevisionDescription.cmake | 130 ++++++++++++++++++ .../GetGitRevisionDescription.cmake.in | 38 +++++ config.h | 3 - gst/extractcolor/CMakeLists.txt | 2 +- gst/extractcolor/gstextractcolor.c | 2 +- gst/videoadjust/CMakeLists.txt | 2 +- gst/videoadjust/gstvideoadjust.c | 2 +- sys/bitflow/CMakeLists.txt | 2 +- sys/bitflow/gstbitflowsrc.c | 2 +- sys/edt/CMakeLists.txt | 2 +- sys/edt/gstedt.c | 2 +- sys/euresys/CMakeLists.txt | 2 +- sys/euresys/gsteuresyssrc.c | 2 +- sys/idsueye/CMakeLists.txt | 2 +- sys/idsueye/gstidsueyesrc.c | 2 +- sys/imperx/CMakeLists.txt | 2 +- sys/imperx/gstframelinksrc.c | 2 +- sys/matrox/CMakeLists.txt | 2 +- sys/matrox/gstmatroxsrc.c | 2 +- sys/niimaq/CMakeLists.txt | 2 +- sys/niimaq/gstniimaq.c | 2 +- sys/niimaqdx/CMakeLists.txt | 2 +- sys/niimaqdx/gstniimaqdx.c | 2 +- sys/phoenix/CMakeLists.txt | 2 +- sys/phoenix/gstphoenixsrc.c | 2 +- sys/pixci/CMakeLists.txt | 2 +- sys/pixci/gstpixcisrc.c | 2 +- sys/sapera/CMakeLists.txt | 2 +- sys/sapera/gstsaperasrc.cpp | 2 +- 30 files changed, 216 insertions(+), 30 deletions(-) create mode 100644 cmake/modules/GetGitRevisionDescription.cmake create mode 100644 cmake/modules/GetGitRevisionDescription.cmake.in diff --git a/CMakeLists.txt b/CMakeLists.txt index b414976..17ccc13 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,29 @@ cmake_minimum_required(VERSION "2.8.0") +project(gst-plugins-vision) + +# add local cmake modules list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) -project(gst-plugins-vision) +# get git version info +include(GetGitRevisionDescription) +git_describe(GIT_DESCRIBE --dirty) +add_definitions(-DPACKAGE_VERSION="${GIT_DESCRIBE}") + +# configure CPack +set(CPACK_GENERATOR "ZIP") +set(CPACK_ARCHIVE_COMPONENT_INSTALL ON) +set(CPACK_COMPONENTS_GROUPING IGNORE) +set(CPACK_COMPONENTS_ALL pdb Unspecified) +set(CPACK_PACKAGE_VERSION ${GIT_DESCRIBE}) +if (CMAKE_SIZEOF_VOID_P EQUAL 8) + set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION}-x86_64") +else () + set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-x86") +endif () +set(CPACK_ARCHIVE_PDB_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-pdbs") +set(CPACK_ARCHIVE_UNSPECIFIED_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}") +include(CPack) include(MacroLogFeature) diff --git a/cmake/modules/GetGitRevisionDescription.cmake b/cmake/modules/GetGitRevisionDescription.cmake new file mode 100644 index 0000000..31d35f4 --- /dev/null +++ b/cmake/modules/GetGitRevisionDescription.cmake @@ -0,0 +1,130 @@ +# - Returns a version string from Git +# +# These functions force a re-configure on each git commit so that you can +# trust the values of the variables in your build system. +# +# get_git_head_revision( [ ...]) +# +# Returns the refspec and sha hash of the current head revision +# +# git_describe( [ ...]) +# +# Returns the results of git describe on the source tree, and adjusting +# the output so that it tests false if an error occurs. +# +# git_get_exact_tag( [ ...]) +# +# Returns the results of git describe --exact-match on the source tree, +# and adjusting the output so that it tests false if there was no exact +# matching tag. +# +# Requires CMake 2.6 or newer (uses the 'function' command) +# +# Original Author: +# 2009-2010 Ryan Pavlik +# http://academic.cleardefinition.com +# Iowa State University HCI Graduate Program/VRAC +# +# Copyright Iowa State University 2009-2010. +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +if(__get_git_revision_description) + return() +endif() +set(__get_git_revision_description YES) + +# We must run the following at "include" time, not at function call time, +# to find the path to this module rather than the path to a calling list file +get_filename_component(_gitdescmoddir ${CMAKE_CURRENT_LIST_FILE} PATH) + +function(get_git_head_revision _refspecvar _hashvar) + set(GIT_PARENT_DIR "${CMAKE_CURRENT_SOURCE_DIR}") + set(GIT_DIR "${GIT_PARENT_DIR}/.git") + while(NOT EXISTS "${GIT_DIR}") # .git dir not found, search parent directories + set(GIT_PREVIOUS_PARENT "${GIT_PARENT_DIR}") + get_filename_component(GIT_PARENT_DIR ${GIT_PARENT_DIR} PATH) + if(GIT_PARENT_DIR STREQUAL GIT_PREVIOUS_PARENT) + # We have reached the root directory, we are not in git + set(${_refspecvar} "GITDIR-NOTFOUND" PARENT_SCOPE) + set(${_hashvar} "GITDIR-NOTFOUND" PARENT_SCOPE) + return() + endif() + set(GIT_DIR "${GIT_PARENT_DIR}/.git") + endwhile() + # check if this is a submodule + if(NOT IS_DIRECTORY ${GIT_DIR}) + file(READ ${GIT_DIR} submodule) + string(REGEX REPLACE "gitdir: (.*)\n$" "\\1" GIT_DIR_RELATIVE ${submodule}) + get_filename_component(SUBMODULE_DIR ${GIT_DIR} PATH) + get_filename_component(GIT_DIR ${SUBMODULE_DIR}/${GIT_DIR_RELATIVE} ABSOLUTE) + endif() + set(GIT_DATA "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/git-data") + if(NOT EXISTS "${GIT_DATA}") + file(MAKE_DIRECTORY "${GIT_DATA}") + endif() + + if(NOT EXISTS "${GIT_DIR}/HEAD") + return() + endif() + set(HEAD_FILE "${GIT_DATA}/HEAD") + configure_file("${GIT_DIR}/HEAD" "${HEAD_FILE}" COPYONLY) + + configure_file("${_gitdescmoddir}/GetGitRevisionDescription.cmake.in" + "${GIT_DATA}/grabRef.cmake" + @ONLY) + include("${GIT_DATA}/grabRef.cmake") + + set(${_refspecvar} "${HEAD_REF}" PARENT_SCOPE) + set(${_hashvar} "${HEAD_HASH}" PARENT_SCOPE) +endfunction() + +function(git_describe _var) + if(NOT GIT_FOUND) + find_package(Git QUIET) + endif() + get_git_head_revision(refspec hash) + if(NOT GIT_FOUND) + set(${_var} "GIT-NOTFOUND" PARENT_SCOPE) + return() + endif() + if(NOT hash) + set(${_var} "HEAD-HASH-NOTFOUND" PARENT_SCOPE) + return() + endif() + + # TODO sanitize + #if((${ARGN}" MATCHES "&&") OR + # (ARGN MATCHES "||") OR + # (ARGN MATCHES "\\;")) + # message("Please report the following error to the project!") + # message(FATAL_ERROR "Looks like someone's doing something nefarious with git_describe! Passed arguments ${ARGN}") + #endif() + + #message(STATUS "Arguments to execute_process: ${ARGN}") + + execute_process(COMMAND + "${GIT_EXECUTABLE}" + describe + # ${hash} # doesn't make sense to specify hash and --dirty + ${ARGN} + WORKING_DIRECTORY + "${CMAKE_SOURCE_DIR}" + RESULT_VARIABLE + res + OUTPUT_VARIABLE + out + #ERROR_QUIET + OUTPUT_STRIP_TRAILING_WHITESPACE) + if(NOT res EQUAL 0) + set(out "${out}-${res}-NOTFOUND") + endif() + + set(${_var} "${out}" PARENT_SCOPE) +endfunction() + +function(git_get_exact_tag _var) + git_describe(out --exact-match ${ARGN}) + set(${_var} "${out}" PARENT_SCOPE) +endfunction() diff --git a/cmake/modules/GetGitRevisionDescription.cmake.in b/cmake/modules/GetGitRevisionDescription.cmake.in new file mode 100644 index 0000000..888ce13 --- /dev/null +++ b/cmake/modules/GetGitRevisionDescription.cmake.in @@ -0,0 +1,38 @@ +# +# Internal file for GetGitRevisionDescription.cmake +# +# Requires CMake 2.6 or newer (uses the 'function' command) +# +# Original Author: +# 2009-2010 Ryan Pavlik +# http://academic.cleardefinition.com +# Iowa State University HCI Graduate Program/VRAC +# +# Copyright Iowa State University 2009-2010. +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) + +set(HEAD_HASH) + +file(READ "@HEAD_FILE@" HEAD_CONTENTS LIMIT 1024) + +string(STRIP "${HEAD_CONTENTS}" HEAD_CONTENTS) +if(HEAD_CONTENTS MATCHES "ref") + # named branch + string(REPLACE "ref: " "" HEAD_REF "${HEAD_CONTENTS}") + if(EXISTS "@GIT_DIR@/${HEAD_REF}") + configure_file("@GIT_DIR@/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY) + elseif(EXISTS "@GIT_DIR@/logs/${HEAD_REF}") + configure_file("@GIT_DIR@/logs/${HEAD_REF}" "@GIT_DATA@/head-ref" COPYONLY) + set(HEAD_HASH "${HEAD_REF}") + endif() +else() + # detached HEAD + configure_file("@GIT_DIR@/HEAD" "@GIT_DATA@/head-ref" COPYONLY) +endif() + +if(NOT HEAD_HASH) + file(READ "@GIT_DATA@/head-ref" HEAD_HASH LIMIT 1024) + string(STRIP "${HEAD_HASH}" HEAD_HASH) +endif() diff --git a/config.h b/config.h index 3a7b2a9..774029a 100644 --- a/config.h +++ b/config.h @@ -7,7 +7,4 @@ /* package origin */ #define GST_PACKAGE_ORIGIN "Unknown package origin" -/* Version number of package */ -#define VERSION "0.10.0.1" - #define PACKAGE "gst-plugins-vision" diff --git a/gst/extractcolor/CMakeLists.txt b/gst/extractcolor/CMakeLists.txt index 78e084f..21cbb86 100644 --- a/gst/extractcolor/CMakeLists.txt +++ b/gst/extractcolor/CMakeLists.txt @@ -25,6 +25,6 @@ target_link_libraries (${libname} ${GSTREAMER_VIDEO_LIBRARY}) set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") -install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0 COMPONENT pdb) install(TARGETS ${libname} LIBRARY DESTINATION lib/gstreamer-1.0) diff --git a/gst/extractcolor/gstextractcolor.c b/gst/extractcolor/gstextractcolor.c index b5d9777..040b40f 100644 --- a/gst/extractcolor/gstextractcolor.c +++ b/gst/extractcolor/gstextractcolor.c @@ -449,4 +449,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, extract_color, "Filter that applies various hacks to a video stream", - plugin_init, VERSION, GST_LICENSE, PACKAGE_NAME, GST_PACKAGE_ORIGIN); + plugin_init, PACKAGE_VERSION, GST_LICENSE, PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/gst/videoadjust/CMakeLists.txt b/gst/videoadjust/CMakeLists.txt index 4842846..5665c03 100644 --- a/gst/videoadjust/CMakeLists.txt +++ b/gst/videoadjust/CMakeLists.txt @@ -21,6 +21,6 @@ target_link_libraries (${libname} ${GSTREAMER_VIDEO_LIBRARY}) set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") -install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0 COMPONENT pdb) install (TARGETS ${libname} LIBRARY DESTINATION lib/gstreamer-1.0) diff --git a/gst/videoadjust/gstvideoadjust.c b/gst/videoadjust/gstvideoadjust.c index c846566..1b94896 100644 --- a/gst/videoadjust/gstvideoadjust.c +++ b/gst/videoadjust/gstvideoadjust.c @@ -30,4 +30,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, videoadjust, "Filters that apply transform from 16-bit to 8-bit video", - plugin_init, VERSION, GST_LICENSE, PACKAGE_NAME, GST_PACKAGE_ORIGIN); + plugin_init, PACKAGE_VERSION, GST_LICENSE, PACKAGE_NAME, GST_PACKAGE_ORIGIN); diff --git a/sys/bitflow/CMakeLists.txt b/sys/bitflow/CMakeLists.txt index c201b7e..157a62b 100644 --- a/sys/bitflow/CMakeLists.txt +++ b/sys/bitflow/CMakeLists.txt @@ -24,6 +24,6 @@ target_link_libraries (${libname} ${BITFLOW_LIBRARIES}) set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") -install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0 COMPONENT pdb) install(TARGETS ${libname} LIBRARY DESTINATION lib/gstreamer-1.0) diff --git a/sys/bitflow/gstbitflowsrc.c b/sys/bitflow/gstbitflowsrc.c index 0534fd1..066a360 100644 --- a/sys/bitflow/gstbitflowsrc.c +++ b/sys/bitflow/gstbitflowsrc.c @@ -643,4 +643,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, bitflow, "BitFlow frame grabber source", - plugin_init, VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) + plugin_init, PACKAGE_VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/edt/CMakeLists.txt b/sys/edt/CMakeLists.txt index 9570798..4130823 100644 --- a/sys/edt/CMakeLists.txt +++ b/sys/edt/CMakeLists.txt @@ -27,6 +27,6 @@ target_link_libraries (${libname} ${EDT_LIBRARIES}) set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") -install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0 COMPONENT pdb) install(TARGETS ${libname} LIBRARY DESTINATION lib/gstreamer-1.0) diff --git a/sys/edt/gstedt.c b/sys/edt/gstedt.c index 558b4c4..6064c6a 100644 --- a/sys/edt/gstedt.c +++ b/sys/edt/gstedt.c @@ -31,4 +31,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, edt, "EDT PDV elements", - plugin_init, VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) \ No newline at end of file + plugin_init, PACKAGE_VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) \ No newline at end of file diff --git a/sys/euresys/CMakeLists.txt b/sys/euresys/CMakeLists.txt index c3ff281..247f65e 100644 --- a/sys/euresys/CMakeLists.txt +++ b/sys/euresys/CMakeLists.txt @@ -24,6 +24,6 @@ target_link_libraries (${libname} ${EURESYS_LIBRARIES}) set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") -install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0 COMPONENT pdb) install (TARGETS ${libname} LIBRARY DESTINATION lib/gstreamer-1.0) diff --git a/sys/euresys/gsteuresyssrc.c b/sys/euresys/gsteuresyssrc.c index ed3aa5d..7a6bbfc 100644 --- a/sys/euresys/gsteuresyssrc.c +++ b/sys/euresys/gsteuresyssrc.c @@ -774,4 +774,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, euresys, "Euresys Multicam source", - plugin_init, VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) + plugin_init, PACKAGE_VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/idsueye/CMakeLists.txt b/sys/idsueye/CMakeLists.txt index df3b07f..af82cb6 100644 --- a/sys/idsueye/CMakeLists.txt +++ b/sys/idsueye/CMakeLists.txt @@ -24,6 +24,6 @@ target_link_libraries (${libname} ${IDSUEYE_LIBRARIES}) set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") -install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0 COMPONENT pdb) install(TARGETS ${libname} LIBRARY DESTINATION lib/gstreamer-1.0) diff --git a/sys/idsueye/gstidsueyesrc.c b/sys/idsueye/gstidsueyesrc.c index 8152e25..55661b0 100644 --- a/sys/idsueye/gstidsueyesrc.c +++ b/sys/idsueye/gstidsueyesrc.c @@ -747,4 +747,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, idsueye, "IDS uEye frame grabber source", - plugin_init, VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) + plugin_init, PACKAGE_VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/imperx/CMakeLists.txt b/sys/imperx/CMakeLists.txt index d5afa98..554aeac 100644 --- a/sys/imperx/CMakeLists.txt +++ b/sys/imperx/CMakeLists.txt @@ -24,6 +24,6 @@ target_link_libraries (${libname} ${IMPERX_FLEX_LIBRARIES}) set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") -install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0 COMPONENT pdb) install(TARGETS ${libname} LIBRARY DESTINATION lib/gstreamer-1.0) diff --git a/sys/imperx/gstframelinksrc.c b/sys/imperx/gstframelinksrc.c index 29a25a1..ec8b1df 100644 --- a/sys/imperx/gstframelinksrc.c +++ b/sys/imperx/gstframelinksrc.c @@ -766,4 +766,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, imperx, "IMPERX FrameLink Express frame grabber source", - plugin_init, VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) + plugin_init, PACKAGE_VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/matrox/CMakeLists.txt b/sys/matrox/CMakeLists.txt index 30802bf..a25e26b 100644 --- a/sys/matrox/CMakeLists.txt +++ b/sys/matrox/CMakeLists.txt @@ -24,6 +24,6 @@ target_link_libraries (${libname} ${MATROX_LIBRARIES}) set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") -install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0 COMPONENT pdb) install(TARGETS ${libname} LIBRARY DESTINATION lib/gstreamer-1.0) diff --git a/sys/matrox/gstmatroxsrc.c b/sys/matrox/gstmatroxsrc.c index b30f6f0..e1081bf 100644 --- a/sys/matrox/gstmatroxsrc.c +++ b/sys/matrox/gstmatroxsrc.c @@ -816,4 +816,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, matrox, "Matrox Imaging Library video source", - plugin_init, VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) + plugin_init, PACKAGE_VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/niimaq/CMakeLists.txt b/sys/niimaq/CMakeLists.txt index 1fb2293..50a08ff 100644 --- a/sys/niimaq/CMakeLists.txt +++ b/sys/niimaq/CMakeLists.txt @@ -24,6 +24,6 @@ target_link_libraries (${libname} ${NIIMAQ_LIBRARIES}) set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") -install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0 COMPONENT pdb) install(TARGETS ${libname} LIBRARY DESTINATION lib/gstreamer-1.0) diff --git a/sys/niimaq/gstniimaq.c b/sys/niimaq/gstniimaq.c index ef94d4a..4c6cb7c 100644 --- a/sys/niimaq/gstniimaq.c +++ b/sys/niimaq/gstniimaq.c @@ -946,5 +946,5 @@ plugin_init (GstPlugin * plugin) } GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, niimaq, - "NI-IMAQ source element", plugin_init, VERSION, GST_LICENSE, PACKAGE_NAME, + "NI-IMAQ source element", plugin_init, PACKAGE_VERSION, GST_LICENSE, PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/niimaqdx/CMakeLists.txt b/sys/niimaqdx/CMakeLists.txt index a56e44a..d30004c 100644 --- a/sys/niimaqdx/CMakeLists.txt +++ b/sys/niimaqdx/CMakeLists.txt @@ -29,6 +29,6 @@ target_link_libraries (${libname} ${NIIMAQDX_LIBRARIES}) set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") -install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0 COMPONENT pdb) install(TARGETS ${libname} LIBRARY DESTINATION lib/gstreamer-1.0) \ No newline at end of file diff --git a/sys/niimaqdx/gstniimaqdx.c b/sys/niimaqdx/gstniimaqdx.c index 671e821..7d5a5e7 100644 --- a/sys/niimaqdx/gstniimaqdx.c +++ b/sys/niimaqdx/gstniimaqdx.c @@ -1255,5 +1255,5 @@ plugin_init (GstPlugin * plugin) } GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, niimaqdx, - "NI-IMAQdx source element", plugin_init, VERSION, GST_LICENSE, PACKAGE_NAME, + "NI-IMAQdx source element", plugin_init, PACKAGE_VERSION, GST_LICENSE, PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/phoenix/CMakeLists.txt b/sys/phoenix/CMakeLists.txt index 33b3a4d..6402765 100644 --- a/sys/phoenix/CMakeLists.txt +++ b/sys/phoenix/CMakeLists.txt @@ -24,6 +24,6 @@ target_link_libraries (${libname} ${PHOENIX_LIBRARIES}) set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") -install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0 COMPONENT pdb) install(TARGETS ${libname} LIBRARY DESTINATION lib/gstreamer-1.0) \ No newline at end of file diff --git a/sys/phoenix/gstphoenixsrc.c b/sys/phoenix/gstphoenixsrc.c index bc7955d..c24eb66 100644 --- a/sys/phoenix/gstphoenixsrc.c +++ b/sys/phoenix/gstphoenixsrc.c @@ -905,4 +905,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, phoenix, "Phoenix frame grabber source", - plugin_init, VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) + plugin_init, PACKAGE_VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/pixci/CMakeLists.txt b/sys/pixci/CMakeLists.txt index 0c3c510..a2a20aa 100644 --- a/sys/pixci/CMakeLists.txt +++ b/sys/pixci/CMakeLists.txt @@ -24,6 +24,6 @@ target_link_libraries (${libname} ${XCLIB_LIBRARIES}) set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") -install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0 COMPONENT pdb) install(TARGETS ${libname} LIBRARY DESTINATION lib/gstreamer-1.0) \ No newline at end of file diff --git a/sys/pixci/gstpixcisrc.c b/sys/pixci/gstpixcisrc.c index 00999c9..4ef64ac 100644 --- a/sys/pixci/gstpixcisrc.c +++ b/sys/pixci/gstpixcisrc.c @@ -784,4 +784,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, pixci, "Pixci frame grabber source", - plugin_init, VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) + plugin_init, PACKAGE_VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff --git a/sys/sapera/CMakeLists.txt b/sys/sapera/CMakeLists.txt index 0079a99..7ba666a 100644 --- a/sys/sapera/CMakeLists.txt +++ b/sys/sapera/CMakeLists.txt @@ -24,6 +24,6 @@ target_link_libraries (${libname} ${SAPERA_LIBRARIES}) set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") -install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0 COMPONENT pdb) install(TARGETS ${libname} LIBRARY DESTINATION lib/gstreamer-1.0) diff --git a/sys/sapera/gstsaperasrc.cpp b/sys/sapera/gstsaperasrc.cpp index 12acb18..63c7c43 100644 --- a/sys/sapera/gstsaperasrc.cpp +++ b/sys/sapera/gstsaperasrc.cpp @@ -768,4 +768,4 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_VERSION_MINOR, sapera, "Teledyne DALSA Sapera frame grabber source", - plugin_init, VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN) + plugin_init, PACKAGE_VERSION, "LGPL", PACKAGE_NAME, GST_PACKAGE_ORIGIN)