use add_subdirectory for libv4l2cpp

3 years ago · 1f0c7686c3
parent d6c07b11cd
commit 1f0c7686c3
2 changed files with 4 additions and 5 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -86,8 +86,8 @@ else()
 endif()

 # librtsp
-aux_source_directory(src SRC_FILES)
-add_library (libv4l2rtspserver STATIC ${LIVESOURCE} ${SRC_FILES})	
+aux_source_directory(src LIBV4L2RTSP_SRC_FILES)
+add_library (libv4l2rtspserver STATIC ${LIVESOURCE} ${LIBV4L2RTSP_SRC_FILES})	
 target_include_directories(libv4l2rtspserver PUBLIC inc ${LIVEINCLUDE})
 target_link_libraries (${PROJECT_NAME} libv4l2rtspserver) 
 if (OpenSSL_FOUND)
@ -108,9 +108,8 @@ endif()

 # v4l2wrapper
 EXEC_PROGRAM("git submodule update --init")
-aux_source_directory(v4l2wrapper/src LIBSRC_FILES)
+add_subdirectory(v4l2wrapper)
 include_directories("v4l2wrapper/inc")
-add_library(v4l2wrapper STATIC ${LIBSRC_FILES})
 target_link_libraries (${PROJECT_NAME} v4l2wrapper) 

 #testing
--- a/2
+++ b/2
@ -1 +1 @@
-Subproject commit c165469e94521b767b548c2b34dcbb57a027bb01
+Subproject commit 21d4d0beac3296d044f96d300614a7505dba2280