Merge pull request #23 from aja-video/update-cmake-16_2

cmake: Update CMake to latest AJA development version

CMakeLists.txt

@@ -3,94 +3,58 @@ cmake_minimum_required(VERSION 3.10)
 project(ntv2)
 
 set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
-# AJA Includes
+
+# AJA includes
 include(AJAHelpers)
-include(BuildOptions)
-include(CommonDefines)
-include(CommonFlags)
-include(CommonPaths)
-include(CommonVars)
+include(AJABuildOptions)
+include(AJACommonDefines)
+include(AJACommonFlags)
+include(AJACommonPaths)
+include(AJACommonVars)
+include(AJAVersionConfig)
 # CMake includes
 include(GNUInstallDirs)
 
-# Override the following variables to set the NTV2 SDK version defines and strings used for the SDK and apps
-if (AJA_BUILDING_CMAKE)
-    string(TIMESTAMP AJA_BUILD_YEAR "%Y")
-    string(TIMESTAMP DATETIME_NOW "\"%A %b %d, %Y (%m/%d/%Y @ %H:%M:%S GMT+8)\"")
-    string(TIMESTAMP DATETIME_NOW "\"%m/%d/%Y +8:%H:%M:%S\"")
-    if (NOT AJA_NTV2_SDK_VERSION_MAJOR)
-        set(AJA_NTV2_SDK_VERSION_MAJOR 16)
-    endif()
-    if (NOT AJA_NTV2_SDK_VERSION_MINOR)
-        set(AJA_NTV2_SDK_VERSION_MINOR 2)
-    endif()
-    if (NOT AJA_NTV2_SDK_VERSION_POINT)
-        set(AJA_NTV2_SDK_VERSION_POINT 0)
-    endif()
-    if (NOT AJA_NTV2_SDK_BUILD_NUMBER)
-        set(AJA_NTV2_SDK_BUILD_NUMBER 1)
-    endif()
-    set(AJA_NTV2_SDK_BUILD_DATETIME ${DATETIME_NOW})
-    set(AJA_NTV2_SDK_BUILD_TYPE "\"d\"") # r = release, d = debug, b = beta
-    set(AJA_NTV2_VER_STR "${AJA_NTV2_SDK_VERSION_MAJOR}.${AJA_NTV2_SDK_VERSION_MINOR}.${AJA_NTV2_SDK_VERSION_POINT}")
-    set(AJA_NTV2_VER_STR_LONG "${AJA_NTV2_VER_STR}.${AJA_NTV2_SDK_BUILD_NUMBER}")
-    string(REPLACE "." "," AJA_NTV2_VER_STR_COMMA "${AJA_NTV2_VER_STR_LONG}")
-
-    string(REPLACE "\"" "" aja_ntv2_build_type_letter "${AJA_NTV2_SDK_BUILD_TYPE}")
-    message(STATUS "ntv2 version: ${AJA_NTV2_VER_STR} ${aja_ntv2_build_type_letter}${AJA_NTV2_SDK_BUILD_NUMBER}")
-endif()
-
-message(STATUS "Platform: ${CMAKE_SYSTEM_NAME}")
-message(STATUS "Arch: ${CMAKE_HOST_SYSTEM_PROCESSOR}")
-message(STATUS "Compiler: ${CMAKE_CXX_COMPILER_ID}")
+aja_message(STATUS "Platform: ${CMAKE_SYSTEM_NAME}")
+aja_message(STATUS "Arch: ${CMAKE_HOST_SYSTEM_PROCESSOR}")
+aja_message(STATUS "Compiler: ${CMAKE_CXX_COMPILER_ID}")
+aja_message(STATUS "Install Prefix: ${CMAKE_INSTALL_PREFIX}")
 if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
-    message(STATUS "Windows API Version: ${CMAKE_SYSTEM_VERSION}")
+    aja_message(STATUS "Windows API Version: ${CMAKE_SYSTEM_VERSION}")
     string(REPLACE "." ";" AJA_WIN_API_VER "${CMAKE_SYSTEM_VERSION}")
     list(GET AJA_WIN_API_VER 0 AJA_WIN_API_VER_MAJOR)
     list(GET AJA_WIN_API_VER 1 AJA_WIN_API_VER_MINOR)
     list(GET AJA_WIN_API_VER 2 AJA_WIN_API_VER_BUILD)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    message (STATUS "macOS Architectures: ${CMAKE_OSX_ARCHITECTURES}")
-    message (STATUS "macOS Deployment Target: ${CMAKE_OSX_DEPLOYMENT_TARGET}")
+    aja_message(STATUS "macOS Architectures: ${CMAKE_OSX_ARCHITECTURES}")
+    aja_message(STATUS "macOS Deployment Target: ${CMAKE_OSX_DEPLOYMENT_TARGET}")
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 else()
-    message(FATAL_ERROR "Unsupported platform: ${CMAKE_SYSTEM_NAME}")
-endif()
-
-message(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
-
-# Optional build artifacts output directory
-if (AJA_DEPLOY_OUTPUTS)
-    set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY
-        "${AJA_CMAKE_DIR}/../out/${CMAKE_SYSTEM_NAME}-${CMAKE_CXX_COMPILER_ID}-${AJA_BITS}bit/lib")
-    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY
-        "${AJA_CMAKE_DIR}/../out/${CMAKE_SYSTEM_NAME}-${CMAKE_CXX_COMPILER_ID}-${AJA_BITS}bit/lib")
-    set(CMAKE_RUNTIME_OUTPUT_DIRECTORY
-        "${AJA_CMAKE_DIR}/../out/${CMAKE_SYSTEM_NAME}-${CMAKE_CXX_COMPILER_ID}-${AJA_BITS}bit/bin")
+    aja_message(FATAL_ERROR "Unsupported platform: ${CMAKE_SYSTEM_NAME}")
 endif()
 
 # Add NTV2 sub-directories to CMake build config
 if (AJA_BUILD_APPS AND EXISTS ${AJA_APPS_ROOT})
-    message(STATUS "Adding ajaapps...")
+    aja_message(STATUS "adding ajaapps...")
     add_subdirectory(ajaapps)
 endif()
 if (AJA_BUILD_DRIVER AND EXISTS ${AJA_DRIVER_ROOT})
-    message(STATUS "Adding ajadriver...")
+    aja_message(STATUS "adding ajadriver...")
     add_subdirectory(ajadriver)
 endif()
 if (AJA_BUILD_LIBS AND EXISTS ${AJA_LIBRARIES_ROOT})
-    message(STATUS "Adding ajalibraries...")
+    aja_message(STATUS "adding ajalibraries...")
     add_subdirectory(ajalibraries)
 endif()
 if (AJA_BUILD_PLUGINS AND EXISTS ${AJA_PLUGINS_ROOT})
-    message(STATUS "Adding ajaplugins...")
+    aja_message(STATUS "adding ajaplugins...")
     add_subdirectory(ajaplugins)
 endif()
 if (AJA_BUILD_QA AND EXISTS ${AJA_QA_ROOT})
-    message(STATUS "Adding qa...")
+    aja_message(STATUS "adding qa...")
     add_subdirectory(qa)
 endif()
 if (AJA_BUILD_NONAJA AND EXISTS ${NON_AJA_ROOT})
-	message(STATUS "Adding non-aja...")
-	add_subdirectory(non-aja)
+    aja_message(STATUS "adding non-aja...")
+    add_subdirectory(non-aja)
 endif()

ajaapps/CMakeLists.txt

@@ -1,87 +1,89 @@
+include(AJAHelpers)
 # aja apps
 if (AJA_BUILD_APPS)
     # aja core demos
-    add_subdirectory(crossplatform/demoapps/ntv2burn)
-    add_subdirectory(crossplatform/demoapps/ntv2burn4kquadrant)
-    add_subdirectory(crossplatform/demoapps/ntv2capture)
-    add_subdirectory(crossplatform/demoapps/ntv2capture4k)
-    add_subdirectory(crossplatform/demoapps/ntv2capture8k)
-    add_subdirectory(crossplatform/demoapps/ntv2dolbyplayer)
-    add_subdirectory(crossplatform/demoapps/ntv2enumerateboards)
-    add_subdirectory(crossplatform/demoapps/ntv2fieldburn)
-    add_subdirectory(crossplatform/demoapps/ntv2hdrsetup)
-    add_subdirectory(crossplatform/demoapps/ntv2llburn)
-    add_subdirectory(crossplatform/demoapps/ntv2outputtestpattern)
-    add_subdirectory(crossplatform/demoapps/ntv2player)
-    add_subdirectory(crossplatform/demoapps/ntv2player4k)
-    add_subdirectory(crossplatform/demoapps/ntv2player8k)
-    add_subdirectory(crossplatform/demoapps/ntv2switchbitfile)
+    aja_add_subdirectory(crossplatform/demoapps/ntv2burn)
+    aja_add_subdirectory(crossplatform/demoapps/ntv2burn4kquadrant)
+    aja_add_subdirectory(crossplatform/demoapps/ntv2capture)
+    aja_add_subdirectory(crossplatform/demoapps/ntv2capture4k)
+    aja_add_subdirectory(crossplatform/demoapps/ntv2capture8k)
+    aja_add_subdirectory(crossplatform/demoapps/ntv2dolbyplayer)
+    aja_add_subdirectory(crossplatform/demoapps/ntv2enumerateboards)
+    aja_add_subdirectory(crossplatform/demoapps/ntv2fieldburn)
+    aja_add_subdirectory(crossplatform/demoapps/ntv2hdrsetup)
+    aja_add_subdirectory(crossplatform/demoapps/ntv2llburn)
+    aja_add_subdirectory(crossplatform/demoapps/ntv2outputtestpattern)
+    aja_add_subdirectory(crossplatform/demoapps/ntv2player)
+    aja_add_subdirectory(crossplatform/demoapps/ntv2player4k)
+    aja_add_subdirectory(crossplatform/demoapps/ntv2player8k)
+    aja_add_subdirectory(crossplatform/demoapps/ntv2switchbitfile)
 
     # nvidia demos
-    add_subdirectory(crossplatform/demoapps/NVIDIA/cudalowlatencydemo)
-    add_subdirectory(crossplatform/demoapps/NVIDIA/dvplowlatencydemo)
+    # aja_add_subdirectory(crossplatform/demoapps/NVIDIA/cudalowlatencydemo)
+    # aja_add_subdirectory(crossplatform/demoapps/NVIDIA/dvplowlatencydemo)
 
     # tools
-    add_subdirectory(crossplatform/logjammer)
-    add_subdirectory(crossplatform/logreader)
-    add_subdirectory(crossplatform/ntv2firmwareinstaller)
-    add_subdirectory(crossplatform/ntv2thermo)
-    add_subdirectory(crossplatform/pciwhacker)
-    add_subdirectory(crossplatform/rdmawhacker)
-    add_subdirectory(crossplatform/regio)
-    add_subdirectory(crossplatform/supportlog)
-    add_subdirectory(crossplatform/testaux)
-    add_subdirectory(crossplatform/testcrc)
-    add_subdirectory(crossplatform/testframe)
-    add_subdirectory(crossplatform/testp2p)
-    add_subdirectory(crossplatform/testrdma)
-    add_subdirectory(crossplatform/vpidtool)
+    aja_add_subdirectory(crossplatform/logjammer)
+    aja_add_subdirectory(crossplatform/logreader)
+    aja_add_subdirectory(crossplatform/ntv2firmwareinstaller)
+    aja_add_subdirectory(crossplatform/ntv2thermo)
+    aja_add_subdirectory(crossplatform/pciwhacker)
+    aja_add_subdirectory(crossplatform/rdmawhacker)
+    aja_add_subdirectory(crossplatform/regio)
+    aja_add_subdirectory(crossplatform/supportlog)
+    aja_add_subdirectory(crossplatform/testaux)
+    aja_add_subdirectory(crossplatform/testcrc)
+    aja_add_subdirectory(crossplatform/testframe)
+    aja_add_subdirectory(crossplatform/testp2p)
+    aja_add_subdirectory(crossplatform/testrdma)
+    aja_add_subdirectory(crossplatform/vpidtool)
 
     if (NOT AJA_BUILD_OPENSOURCE)
         # retail apps/services
-        add_subdirectory(crossplatform/ajadaemon)
-        add_subdirectory(crossplatform/controlpanel)
-        add_subdirectory(crossplatform/controlroom)
+        aja_add_subdirectory(crossplatform/ajadaemon "AJA Retail Daemon" "AJA Retail Daemon")
+        aja_add_subdirectory(crossplatform/controlpanel "AJA ControlPanel" "AJA ControlPanel - Retail Device Configuration")
+        aja_add_subdirectory(crossplatform/controlroom "AJA ControlRoom" "AJA Control Room - Ingest & Playout Application")
 		if (CMAKE_SYSTEM_NAME STREQUAL "Linux" AND AJA_BUILD_NONAJA)
 			# ndibridge is currently Linux-only, and requires building libsamplerate
-			add_subdirectory(crossplatform/ndibridge)
+			aja_add_subdirectory(crossplatform/ndibridge "AJA NDI Bridge" "AJA NDI Bridge - Make It So")
 		endif()
 
         # oem/internal tools
         # NOTE(paulh): ajalogger is MIT licensed but need to remove dependency on ajagui/AJAAboutBox
-        add_subdirectory(crossplatform/ajalogger)
-        add_subdirectory(crossplatform/hdmiinstatus)
-        add_subdirectory(crossplatform/konaburner)
-        add_subdirectory(crossplatform/mcap)
-        add_subdirectory(crossplatform/ntv2cmd)
-        add_subdirectory(crossplatform/ntv2watcher)
-        add_subdirectory(crossplatform/systemtest)
+        aja_add_subdirectory(crossplatform/ajalogger "AJA Logger" "AJA Logger - Log All The Things")
+        aja_add_subdirectory(crossplatform/hdmiinstatus)
+        aja_add_subdirectory(crossplatform/konaburner)
+        aja_add_subdirectory(crossplatform/mcap)
+        aja_add_subdirectory(crossplatform/ntv2cmd)
+        aja_add_subdirectory(crossplatform/ntv2watcher "AJA NTV2 Watcher" "AJA NTV2 Watcher")
+        # aja_add_subdirectory(crossplatform/rovocontrol "AJA RovoControl" "AJA RovoControl")
+        aja_add_subdirectory(crossplatform/systemtest "AJA System Test" "AJA System Test")
 
         # aja cc demos
-        add_subdirectory(crossplatform/demoapps/ntv2ccgrabber)
-        add_subdirectory(crossplatform/demoapps/ntv2ccplayer)
+        aja_add_subdirectory(crossplatform/demoapps/ntv2ccgrabber)
+        aja_add_subdirectory(crossplatform/demoapps/ntv2ccplayer)
 
         # aja cuda demos (TODO)
-        # add_subdirectory(crossplatform/demoapps/ntv2cudacapture)
+        # aja_add_subdirectory(crossplatform/demoapps/ntv2cudacapture)
         # aja hevc demos
         # NOTE: These demos use proprietary code and are not included in the open-source NTV2 distribution.
-        add_subdirectory(crossplatform/demoapps/ntv2encodehevc)
-        add_subdirectory(crossplatform/demoapps/ntv2encodehevcfile)
-        add_subdirectory(crossplatform/demoapps/ntv2encodehevcvif)
+        aja_add_subdirectory(crossplatform/demoapps/ntv2encodehevc)
+        aja_add_subdirectory(crossplatform/demoapps/ntv2encodehevcfile)
+        aja_add_subdirectory(crossplatform/demoapps/ntv2encodehevcvif)
 
         # aja opengl demos (TODO)
-        # add_subdirectory(crossplatform/demoapps/ntv2oglcapture)
-        # add_subdirectory(crossplatform/demoapps/ntv2ogldpxreader)
-        # add_subdirectory(crossplatform/demoapps/ntv2testOGL)
-        # add_subdirectory(crossplatform/demoapps/ntv2ogloutput)
+        # aja_add_subdirectory(crossplatform/demoapps/ntv2oglcapture)
+        # aja_add_subdirectory(crossplatform/demoapps/ntv2ogldpxreader)
+        # aja_add_subdirectory(crossplatform/demoapps/ntv2testOGL)
+        # aja_add_subdirectory(crossplatform/demoapps/ntv2ogloutput)
 
         # aja Qt-based demos (TODO)
-        # add_subdirectory(crossplatform/demoapps/ntv2dpxplayer)
-        add_subdirectory(crossplatform/demoapps/ntv2konaipj2ksetup)
-        add_subdirectory(crossplatform/demoapps/ntv2konaipjsonsetup)
-        # add_subdirectory(crossplatform/demoapps/ntv2playcorder)
-        # add_subdirectory(crossplatform/demoapps/ntv2recorddpx)
-        # add_subdirectory(crossplatform/demoapps/ntv2stereocapture)
-        # add_subdirectory(crossplatform/demoapps/ntv2playbackdpx)
+        # aja_add_subdirectory(crossplatform/demoapps/ntv2dpxplayer)
+        aja_add_subdirectory(crossplatform/demoapps/ntv2konaipj2ksetup)
+        aja_add_subdirectory(crossplatform/demoapps/ntv2konaipjsonsetup)
+        # aja_add_subdirectory(crossplatform/demoapps/ntv2playcorder)
+        # aja_add_subdirectory(crossplatform/demoapps/ntv2recorddpx)
+        # aja_add_subdirectory(crossplatform/demoapps/ntv2stereocapture)
+        # aja_add_subdirectory(crossplatform/demoapps/ntv2playbackdpx)
     endif()
 endif()

ajaapps/crossplatform/demoapps/NVIDIA/cudalowlatencydemo/CMakeLists.txt

@@ -1,28 +1,29 @@
 # NOTE: Ensure that the CUDA Toolkit v11.4 or later is installed and in your PATH.
+include(AJAHelpers)
 
 if (NOT CMAKE_SYSTEM_NAME STREQUAL "Linux")
-	message("skipping cudalowlatencydemo (requires Linux)")
+	aja_message(STATUS "skipping cudalowlatencydemo (requires Linux)")
 	return()
 endif()
-find_package(CUDA 11.4)
-if (NOT FOUND_CUDA)
-	message("skipping cudalowlatencydemo (CUDA not found)")
+find_package(CUDA 11.2)
+if (NOT CUDA_FOUND)
+	aja_message(STATUS "skipping cudalowlatencydemo (CUDA not found)")
 	return()
 endif()
 set(OpenGL_GL_PREFERENCE LEGACY)
 find_package(OpenGL)
 if (NOT OPENGL_FOUND)
-	message("skipping cudalowlatencydemo (OpenGL not found)")
+	aja_message(STATUS "skipping cudalowlatencydemo (OpenGL not found)")
 	return()
 endif()
 find_package(GLEW)
 if (NOT GLEW_FOUND)
-	message("skipping cudalowlatencydemo (GLEW not found)")
+	aja_message(STATUS "skipping cudalowlatencydemo (GLEW not found)")
 	return()
 endif()
 find_package(X11)
 if (NOT X11_FOUND)
-	message("skipping cudalowlatencydemo (X11 not found)")
+	aja_message(STATUS "skipping cudalowlatencydemo (X11 not found)")
 	return()
 endif()
 
@@ -34,7 +35,6 @@ set(TARGET_COMPILE_DEFS
 	-DAJA_RDMA=1)
 
 set(TARGET_INCLUDE_DIRS
-	${AJA_APPS_ROOT}/crossplatform/demoapps/NVIDIA/common
 	${AJA_APPS_ROOT}/crossplatform/demoapps/NVIDIA/commonCUDA
 	${AJA_APPS_ROOT}/crossplatform/demoapps
 	${AJA_LIBRARIES_ROOT}
@@ -44,8 +44,6 @@ set(TARGET_INCLUDE_DIRS
 	${OPENGL_INCLUDE_DIRS}
 	${GLEW_INCLUDE_DIRS})
 
-message("GLEW INCLUDE: ${GLEW_INCLUDE_DIRS}")
-
 set(DEMO_APPS_SOURCES
 	${AJA_APPS_ROOT}/crossplatform/demoapps/ntv2democommon.cpp)
 set(DEMO_APPS_HEADERS
@@ -56,24 +54,7 @@ set(CUDALOWLATENCYDEMO_BUILD_FILES
 	kernel.cu)
 set(CUDALOWLATENCYDEMO_SOURCES
 	cudaapp.cpp)
-set(NVIDIA_COMMON_SOURCES
-	# ${CMAKE_CURRENT_SOURCE_DIR}/../common/ntv2errorlist.cpp
-	# ${CMAKE_CURRENT_SOURCE_DIR}/../common/ntv2errorlist.h
-	# ${CMAKE_CURRENT_SOURCE_DIR}/../common/ntv2glTextureTransfer.h
-	# ${CMAKE_CURRENT_SOURCE_DIR}/../common/ntv2glTextureTransferNV.cpp
-	# ${CMAKE_CURRENT_SOURCE_DIR}/../common/ntv2glTextureTransferNV.h
-	# ${CMAKE_CURRENT_SOURCE_DIR}/../common/ntv2gpucircularbuffer.cpp
-	# ${CMAKE_CURRENT_SOURCE_DIR}/../common/ntv2gpucircularbuffer.h
-	# ${CMAKE_CURRENT_SOURCE_DIR}/../common/ntv2rendertotexture.cpp
-	# ${CMAKE_CURRENT_SOURCE_DIR}/../common/ntv2rendertotexture.h
-	# ${CMAKE_CURRENT_SOURCE_DIR}/../common/ntv2texture.cpp
-	# ${CMAKE_CURRENT_SOURCE_DIR}/../common/ntv2texture.h
-	# ${CMAKE_CURRENT_SOURCE_DIR}/../common/oglview.cpp
-	# ${CMAKE_CURRENT_SOURCE_DIR}/../common/oglview.h
-	# ${CMAKE_CURRENT_SOURCE_DIR}/../common/opengl.h
-	# ${CMAKE_CURRENT_SOURCE_DIR}/../common/simplegpuvio.cpp
-	# ${CMAKE_CURRENT_SOURCE_DIR}/../common/simplegpuvio.h
-)
+
 set(NVIDIA_COMMONCUDA_SOURCES
 	# ${CMAKE_CURRENT_SOURCE_DIR}/../commonCUDA/assertion.h
 	${CMAKE_CURRENT_SOURCE_DIR}/../commonCUDA/cudaUtils.h
@@ -108,7 +89,6 @@ set(NVIDIA_COMMONCUDA_SOURCES
 
 set(TARGET_SOURCES
 	${CUDALOWLATENCYDEMO_SOURCES}
-	${NVIDIA_COMMON_SOURCES}
 	${NVIDIA_COMMONCUDA_SOURCES}
 	${DEMO_APPS_HEADERS}
 	${DEMO_APPS_SOURCES})
@@ -118,14 +98,14 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
     find_library(FOUNDATION_FRAMEWORK Foundation)
     set(TARGET_LINK_LIBS ${FOUNDATION_FRAMEWORK})
 elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
-	set(TARGET_LINK_LIBS X11 OpenGL::GL OpenGL::GLU GLEW::GLEW cuda cudart dl pthread rt)
+	set(TARGET_LINK_LIBS X11 OpenGL::GL OpenGL::GLU GLEW::GLEW cuda dl pthread rt)
 	# cuda_include_directories(${TARGET_INCLUDE_DIRS})
 	# cuda_compile(CUDA_OBJ kernel.cu)
 	add_executable(cudalowlatencydemo ${TARGET_SOURCES} kernel.cu)
 	add_dependencies(cudalowlatencydemo ${CUDA_OBJ} ajantv2)
-	target_compile_definitions(cudalowlatencydemo PUBLIC ${TARGET_COMPILE_DEFS})
-	target_include_directories(cudalowlatencydemo PUBLIC ${TARGET_INCLUDE_DIRS})
-	target_link_libraries(cudalowlatencydemo PUBLIC ajantv2 ${TARGET_LINK_LIBS})
+	target_compile_definitions(cudalowlatencydemo PRIVATE ${TARGET_COMPILE_DEFS})
+	target_include_directories(cudalowlatencydemo PRIVATE ${TARGET_INCLUDE_DIRS})
+	target_link_libraries(cudalowlatencydemo PRIVATE ajantv2 ${TARGET_LINK_LIBS})
 	# add_custom_command(
 	# 	TARGET cudalowlatencydemo
 	# 	PRE_BUILD
@@ -138,8 +118,6 @@ endif()
 if (AJA_INSTALL_SOURCES)
 	install(FILES ${CUDALOWLATENCYDEMO_SOURCES} DESTINATION ${CMAKE_INSTALL_PREFIX}/ajaapps/crossplatform/demoapps/NVIDIA/cudalowlatencydemo)
 	install(FILES ${CUDALOWLATENCYDEMO_BUILD_FILES} DESTINATION ${CMAKE_INSTALL_PREFIX}/ajaapps/crossplatform/demoapps/NVIDIA/cudalowlatencydemo)
-	install(FILES ${NVIDIA_COMMON_SOURCES} DESTINATION ${CMAKE_INSTALL_PREFIX}/ajaapps/crossplatform/demoapps/NVIDIA/common)
 	install(FILES ${NVIDIA_COMMONCUDA_SOURCES} DESTINATION ${CMAKE_INSTALL_PREFIX}/ajaapps/crossplatform/demoapps/NVIDIA/commonCUDA)
 endif()
 
-message("added cudalowlatencydemo")