From 59a583d8c76e3de5117bbf056493b558ffbab2e0 Mon Sep 17 00:00:00 2001 From: "Joshua M. Doe" Date: Tue, 28 Jun 2016 13:53:48 -0400 Subject: [PATCH] build: clean up CMakeLists.txt and install pdb files alongside dlls --- gst/extractcolor/CMakeLists.txt | 16 +++++++------ gst/videoadjust/CMakeLists.txt | 23 +++++++++--------- sys/edt/CMakeLists.txt | 20 +++++++++------- sys/euresys/CMakeLists.txt | 30 +++++++++++++----------- sys/imperx/CMakeLists.txt | 30 +++++++++++++----------- sys/niimaq/CMakeLists.txt | 41 ++++++++++++++++++--------------- sys/niimaqdx/CMakeLists.txt | 31 ++++++++++++++----------- sys/phoenix/CMakeLists.txt | 30 +++++++++++++----------- sys/pixci/CMakeLists.txt | 27 ++++++++++++---------- sys/sapera/CMakeLists.txt | 29 ++++++++++++----------- 10 files changed, 151 insertions(+), 126 deletions(-) diff --git a/gst/extractcolor/CMakeLists.txt b/gst/extractcolor/CMakeLists.txt index cabdf08..78e084f 100644 --- a/gst/extractcolor/CMakeLists.txt +++ b/gst/extractcolor/CMakeLists.txt @@ -8,21 +8,23 @@ set (HEADERS gstextractcolor.h) include_directories (AFTER - ${GSTREAMER_BASE_INCLUDE_DIR} - ${GSTREAMER_VIDEO_INCLUDE_DIR} ${ORC_INCLUDE_DIR}) -add_library (libgstextractcolor MODULE +set (libname libgstextractcolor) + +add_library (${libname} MODULE ${SOURCES} ${HEADERS}) -target_link_libraries (libgstextractcolor +target_link_libraries (${libname} + ${ORC_LIBRARIES} ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES} ${GSTREAMER_LIBRARY} ${GSTREAMER_BASE_LIBRARY} - ${GSTREAMER_VIDEO_LIBRARY} - ${ORC_LIBRARIES}) + ${GSTREAMER_VIDEO_LIBRARY}) -install (TARGETS libgstextractcolor +set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install(TARGETS ${libname} LIBRARY DESTINATION lib/gstreamer-1.0) diff --git a/gst/videoadjust/CMakeLists.txt b/gst/videoadjust/CMakeLists.txt index 8281a24..4842846 100644 --- a/gst/videoadjust/CMakeLists.txt +++ b/gst/videoadjust/CMakeLists.txt @@ -1,25 +1,26 @@ add_definitions (-DHAVE_CONFIG_H) set (SOURCES - gstvideoadjust.c - gstvideolevels.c) + gstvideoadjust.c + gstvideolevels.c) set (HEADERS - gstvideolevels.h) - -include_directories(AFTER - . ) + gstvideolevels.h) -add_library (libgstvideoadjust MODULE +set (libname libgstvideoadjust) + +add_library (${libname} MODULE ${SOURCES} ${HEADERS}) -target_link_libraries (libgstvideoadjust +target_link_libraries (${libname} ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES} ${GSTREAMER_LIBRARY} ${GSTREAMER_BASE_LIBRARY} ${GSTREAMER_VIDEO_LIBRARY}) - -install (TARGETS libgstvideoadjust - LIBRARY DESTINATION lib/gstreamer-0.10) + +set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install (TARGETS ${libname} + LIBRARY DESTINATION lib/gstreamer-1.0) diff --git a/sys/edt/CMakeLists.txt b/sys/edt/CMakeLists.txt index 63c215e..9570798 100644 --- a/sys/edt/CMakeLists.txt +++ b/sys/edt/CMakeLists.txt @@ -1,22 +1,24 @@ -add_definitions(-DHAVE_CONFIG_H) +add_definitions (-DHAVE_CONFIG_H) -set(SOURCES +set (SOURCES gstedt.c gstedtpdvsink.c gstedtpdvsrc.c) -set(HEADERS +set (HEADERS gstedtpdvsink.h gstedtpdvsrc.h) -include_directories(AFTER +include_directories (AFTER ${EDT_INCLUDE_DIR}) -add_library(libgstedt MODULE +set (libname libgstedt) + +add_library (${libname} MODULE ${SOURCES} ${HEADERS}) -target_link_libraries(libgstedt +target_link_libraries (${libname} ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES} ${GSTREAMER_LIBRARY} @@ -24,5 +26,7 @@ target_link_libraries(libgstedt ${GSTREAMER_VIDEO_LIBRARY} ${EDT_LIBRARIES}) -install(TARGETS libgstedt - LIBRARY DESTINATION lib/gstreamer-1.0) \ No newline at end of file +set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install(TARGETS ${libname} + LIBRARY DESTINATION lib/gstreamer-1.0) diff --git a/sys/euresys/CMakeLists.txt b/sys/euresys/CMakeLists.txt index 036d760..c3ff281 100644 --- a/sys/euresys/CMakeLists.txt +++ b/sys/euresys/CMakeLists.txt @@ -1,27 +1,29 @@ -add_definitions(-DHAVE_CONFIG_H) +add_definitions (-DHAVE_CONFIG_H) -set ( SOURCES - gsteuresyssrc.c ) +set (SOURCES + gsteuresyssrc.c) -set ( HEADERS - gsteuresyssrc.h ) +set (HEADERS + gsteuresyssrc.h) -include_directories ( AFTER - . - ${EURESYS_INCLUDE_DIR} ) +include_directories (AFTER + ${EURESYS_INCLUDE_DIR}) -add_library ( libgsteuresys MODULE +set (libname libgsteuresys) + +add_library (${libname} MODULE ${SOURCES} - ${HEADERS} ) + ${HEADERS}) -target_link_libraries ( libgsteuresys +target_link_libraries (${libname} ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES} ${GSTREAMER_LIBRARY} ${GSTREAMER_BASE_LIBRARY} - ${GSTREAMER_INTERFACE_LIBRARY} ${GSTREAMER_VIDEO_LIBRARY} ${EURESYS_LIBRARIES}) -install (TARGETS libgsteuresys - LIBRARY DESTINATION lib/gstreamer-0.10) \ No newline at end of file +set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install (TARGETS ${libname} + LIBRARY DESTINATION lib/gstreamer-1.0) diff --git a/sys/imperx/CMakeLists.txt b/sys/imperx/CMakeLists.txt index abfa9c5..d5afa98 100644 --- a/sys/imperx/CMakeLists.txt +++ b/sys/imperx/CMakeLists.txt @@ -1,27 +1,29 @@ -add_definitions(-DHAVE_CONFIG_H) +add_definitions (-DHAVE_CONFIG_H) -set ( SOURCES - gstframelinksrc.c ) +set (SOURCES + gstframelinksrc.c) -set ( HEADERS - gstframelinksrc.h ) +set (HEADERS + gstframelinksrc.h) -include_directories ( AFTER - ${IMPERX_FLEX_INCLUDE_DIR} - .) +include_directories (AFTER + ${IMPERX_FLEX_INCLUDE_DIR}) -add_library ( libgstimperxflex MODULE +set (libname libgstimperxflex) + +add_library (${libname} MODULE ${SOURCES} - ${HEADERS} ) + ${HEADERS}) -target_link_libraries ( libgstimperxflex +target_link_libraries (${libname} ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES} ${GSTREAMER_LIBRARY} ${GSTREAMER_BASE_LIBRARY} - ${GSTREAMER_INTERFACE_LIBRARY} ${GSTREAMER_VIDEO_LIBRARY} ${IMPERX_FLEX_LIBRARIES}) - -install (TARGETS libgstimperxflex + +set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install(TARGETS ${libname} LIBRARY DESTINATION lib/gstreamer-1.0) diff --git a/sys/niimaq/CMakeLists.txt b/sys/niimaq/CMakeLists.txt index 969e109..1fb2293 100644 --- a/sys/niimaq/CMakeLists.txt +++ b/sys/niimaq/CMakeLists.txt @@ -1,26 +1,29 @@ -add_definitions(-DHAVE_CONFIG_H) +add_definitions (-DHAVE_CONFIG_H) -set ( SOURCES - gstniimaq.c ) +set (SOURCES + gstniimaq.c) -set ( HEADERS - gstniimaq.h ) +set (HEADERS + gstniimaq.h) -include_directories ( AFTER - . - ${NIIMAQ_INCLUDE_DIR} ) +include_directories (AFTER + ${NIIMAQ_INCLUDE_DIR}) -add_library ( libgstimaq MODULE +set (libname libgstimaq) + +add_library (${libname} MODULE ${SOURCES} - ${HEADERS} ) + ${HEADERS}) -target_link_libraries ( libgstimaq - general ${GLIB2_LIBRARIES} - general ${GOBJECT_LIBRARIES} - general ${GSTREAMER_LIBRARY} - general ${GSTREAMER_BASE_LIBRARY} - general ${GSTREAMER_VIDEO_LIBRARY} - general ${NIIMAQ_LIBRARIES} ) +target_link_libraries (${libname} + ${GLIB2_LIBRARIES} + ${GOBJECT_LIBRARIES} + ${GSTREAMER_LIBRARY} + ${GSTREAMER_BASE_LIBRARY} + ${GSTREAMER_VIDEO_LIBRARY} + ${NIIMAQ_LIBRARIES}) -install (TARGETS libgstimaq - LIBRARY DESTINATION lib/gstreamer-0.10) \ No newline at end of file +set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install(TARGETS ${libname} + LIBRARY DESTINATION lib/gstreamer-1.0) diff --git a/sys/niimaqdx/CMakeLists.txt b/sys/niimaqdx/CMakeLists.txt index ec2e5b3..a56e44a 100644 --- a/sys/niimaqdx/CMakeLists.txt +++ b/sys/niimaqdx/CMakeLists.txt @@ -1,25 +1,26 @@ -add_definitions(-DHAVE_CONFIG_H) +add_definitions (-DHAVE_CONFIG_H) -set(SOURCES - gstniimaqdx.c) +set (SOURCES + gstniimaqdx.c) -set(HEADERS - gstniimaqdx.h) +set (HEADERS + gstniimaqdx.h) -include_directories(AFTER - . +include_directories (AFTER ${NIIMAQDX_INCLUDE_DIR}) -add_library(libgstniimaqdx MODULE +set (libname libgstniimaqdx) + +add_library (${libname} MODULE ${SOURCES} - ${HEADERS} ) + ${HEADERS}) # National Instruments doesn't provide a .lib for 64-bit, so use our own if (CMAKE_SIZEOF_VOID_P EQUAL 8) - set(NIIMAQDX_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/win64/niimaqdx.lib") -endif() + set (NIIMAQDX_LIBRARIES "${CMAKE_CURRENT_SOURCE_DIR}/win64/niimaqdx.lib") +endif () -target_link_libraries(libgstniimaqdx +target_link_libraries (${libname} ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES} ${GSTREAMER_LIBRARY} @@ -27,5 +28,7 @@ target_link_libraries(libgstniimaqdx ${GSTREAMER_VIDEO_LIBRARY} ${NIIMAQDX_LIBRARIES}) -install (TARGETS libgstniimaqdx - LIBRARY DESTINATION lib/gstreamer-0.10) +set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install(TARGETS ${libname} + LIBRARY DESTINATION lib/gstreamer-1.0) \ No newline at end of file diff --git a/sys/phoenix/CMakeLists.txt b/sys/phoenix/CMakeLists.txt index fe6b74b..33b3a4d 100644 --- a/sys/phoenix/CMakeLists.txt +++ b/sys/phoenix/CMakeLists.txt @@ -1,27 +1,29 @@ -add_definitions(-DHAVE_CONFIG_H) +add_definitions (-DHAVE_CONFIG_H) -set ( SOURCES - gstphoenixsrc.c ) +set (SOURCES + gstphoenixsrc.c) -set ( HEADERS - gstphoenixsrc.h ) +set (HEADERS + gstphoenixsrc.h) -include_directories ( AFTER - ${PHOENIX_INCLUDE_DIR} - .) +include_directories (AFTER + ${PHOENIX_INCLUDE_DIR}) -add_library ( libgstphoenix MODULE +set (libname libgstphoenix) + +add_library (${libname} MODULE ${SOURCES} - ${HEADERS} ) + ${HEADERS}) -target_link_libraries ( libgstphoenix +target_link_libraries (${libname} ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES} ${GSTREAMER_LIBRARY} ${GSTREAMER_BASE_LIBRARY} - ${GSTREAMER_INTERFACE_LIBRARY} ${GSTREAMER_VIDEO_LIBRARY} ${PHOENIX_LIBRARIES}) -install (TARGETS libgstphoenix - LIBRARY DESTINATION lib/gstreamer-0.10) \ No newline at end of file +set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install(TARGETS ${libname} + LIBRARY DESTINATION lib/gstreamer-1.0) \ No newline at end of file diff --git a/sys/pixci/CMakeLists.txt b/sys/pixci/CMakeLists.txt index f76cb11..0c3c510 100644 --- a/sys/pixci/CMakeLists.txt +++ b/sys/pixci/CMakeLists.txt @@ -1,20 +1,21 @@ -add_definitions(-DHAVE_CONFIG_H) +add_definitions (-DHAVE_CONFIG_H) -set(SOURCES - gstpixcisrc.c) +set (SOURCES + gstpixcisrc.c) -set(HEADERS - gstpixcisrc.h) +set (HEADERS + gstpixcisrc.h) -include_directories(AFTER - ${XCLIB_INCLUDE_DIR} - .) +include_directories (AFTER + ${XCLIB_INCLUDE_DIR}) -add_library(libgstpixci MODULE +set (libname libgstpixci) + +add_library (${libname} MODULE ${SOURCES} ${HEADERS}) -target_link_libraries(libgstpixci +target_link_libraries (${libname} ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES} ${GSTREAMER_LIBRARY} @@ -22,5 +23,7 @@ target_link_libraries(libgstpixci ${GSTREAMER_VIDEO_LIBRARY} ${XCLIB_LIBRARIES}) -install(TARGETS libgstpixci - LIBRARY DESTINATION lib/gstreamer-0.10) +set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install(TARGETS ${libname} + LIBRARY DESTINATION lib/gstreamer-1.0) \ No newline at end of file diff --git a/sys/sapera/CMakeLists.txt b/sys/sapera/CMakeLists.txt index 62aa684..0079a99 100644 --- a/sys/sapera/CMakeLists.txt +++ b/sys/sapera/CMakeLists.txt @@ -1,26 +1,29 @@ -add_definitions(-DHAVE_CONFIG_H) +add_definitions (-DHAVE_CONFIG_H) -set(SOURCES - gstsaperasrc.cpp) +set (SOURCES + gstsaperasrc.cpp) -set(HEADERS - gstsaperasrc.h) +set (HEADERS + gstsaperasrc.h) -include_directories(AFTER - ${SAPERA_INCLUDE_DIR} - .) +include_directories (AFTER + ${SAPERA_INCLUDE_DIR}) -add_library(libgstsapera MODULE +set (libname libgstsapera) + +add_library (${libname} MODULE ${SOURCES} - ${HEADERS} ) + ${HEADERS}) -target_link_libraries(libgstsapera +target_link_libraries (${libname} ${GLIB2_LIBRARIES} ${GOBJECT_LIBRARIES} ${GSTREAMER_LIBRARY} ${GSTREAMER_BASE_LIBRARY} ${GSTREAMER_VIDEO_LIBRARY} ${SAPERA_LIBRARIES}) - -install(TARGETS libgstsapera + +set (pdbfile "${CMAKE_CURRENT_BINARY_DIR}/\${CMAKE_INSTALL_CONFIG_NAME}/${libname}.pdb") +install (FILES ${pdbfile} DESTINATION lib/gstreamer-1.0) +install(TARGETS ${libname} LIBRARY DESTINATION lib/gstreamer-1.0)