Преглед на файлове

#IQRV #comment [Conan] 将所有的conan 配置放置到一个文件中,并编译通过

gifur преди 4 години
родител
ревизия
2dc5606f47

+ 1 - 1
CMakeLists.txt

@@ -152,10 +152,10 @@ endif(CONAN_EXPORTED)
 
 
 include(conan)
-include(DependencyConanFiles)
 conan_cmake_run(REQUIRES RvcFramework/1.0.7-dev4@LR04.02_FrameworkLib/testing
 	Audio/2020.1230.01@LR04.02_MediaRes/testing
 BASIC_SETUP CMAKE_TARGETS)
+include(DependencyConanFiles)
 
 set(RVC_CONAN_DEP_LIBS ${CONAN_BIN_DIRS})
 if(NOT MSVC)

+ 1 - 0
Module/CMakeLists.txt

@@ -142,6 +142,7 @@ if(BUILD_MOUDLE_TEST)
     message(STATUS "build module test case")
 endif(BUILD_MOUDLE_TEST)
 
+#TODO: move to DependencyConanFiles.cmake
 if(MSVC)
     conan_cmake_run(REQUIRES Misc/2020.1202.1@LR04.02_ModuleDep/Windows
     BASIC_SETUP CMAKE_TARGETS)

+ 11 - 3
Module/mod_mediacontroller/CMakeLists.txt

@@ -64,15 +64,23 @@ target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_FFMPEG}
 	${CONAN_LIB_DIRS_SPANDSP}
 	${CONAN_LIB_DIRS_SPEEXDSP}
-	if(WIN32)
+)
+
+if(MSVC)
+target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_PORTAUDIO}
 	${CONAN_LIB_DIRS_IPP}
 	${CONAN_LIB_DIRS_APACHE-APR}
 	${CONAN_LIB_DIRS_LIB8K}
-	else
+)
+else()
+target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_APR}
-	endif(WIN32)
+	${CONAN_LIB_DIRS_SOFIA}
+	${CONAN_LIB_DIRS_ZLIB}
+	${CONAN_LIB_DIRS_OPENCV}
 )
+endif(MSVC)
 
 # 添加实体需要依赖的其他共享库(包括系统库)
 if(WIN32)

+ 0 - 11
Module/mod_recorder/CMakeLists.txt

@@ -8,17 +8,6 @@ file(GLOB ${MODULE_PREFIX}_SRCS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
 set(MOD_VERSION_STRING "1.0.0-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})
 
-if(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1.6@LR04.02_ThirdParty/shared
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES ffmpeg/4.1.6@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
-
-
 # ÒÀÀµlibwmvrecord
 target_include_directories(${MODULE_NAME} PRIVATE
 	${RVC_FRAMEWORK_INCLUDES_DIR}

+ 16 - 11
Module/mod_sipphone/CMakeLists.txt

@@ -61,7 +61,6 @@ if(WIN32)
 endif(WIN32)
 
 
-
 target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_APR}/apr-1
 	${CONAN_RVCFRAMEWORK_ROOT}/include
@@ -86,6 +85,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_SOFIA}/libsofia-sip-ua/nea
 	${CONAN_INCLUDE_DIRS_SOFIA}/libsofia-sip-ua/soa
 	else
+	${CONAN_INCLUDE_DIRS_PULSEAUDIO}
 	${CONAN_INCLUDE_DIRS_APR}/apr-1
 	${CONAN_INCLUDE_DIRS_SOFIA}/sofia-sip-1.13
 	endif(WIN32)
@@ -93,6 +93,9 @@ target_include_directories(${MODULE_NAME} PRIVATE
 
 message(STATUS "CONAN_INCLUDE_DIRS_SOFIA == ${CONAN_INCLUDE_DIRS_SOFIA}")
 
+
+
+if(MSVC)
 target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_FFMPEG}
 	${CONAN_LIB_DIRS_OPENCV}
@@ -101,22 +104,24 @@ target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_SOFIA}
 	${CONAN_LIB_DIRS_SPEEXDSP}
 	${CONAN_LIB_DIRS_LIBKYSM}
-	if(WIN32)
 	${CONAN_LIB_DIRS_PORTAUDIO}
 	${CONAN_LIB_DIRS_IPP}
 	${CONAN_LIB_DIRS_LIB8K}
 	${CONAN_LIB_DIRS_APACHE-APR}
-	else
-	${CONAN_LIB_DIRS_APR}
-	endif(WIN32)
 )
-
-if(NOT WIN32)
+else()
 target_link_directories(${MODULE_NAME} PRIVATE
-	${CONAN_LIB_DIRS_PULSEAUDIO}
-	)
-endif(NOT WIN32)
-
+    ${CONAN_LIB_DIRS_PULSEAUDIO}
+	${CONAN_LIB_DIRS_FFMPEG}
+	${CONAN_LIB_DIRS_OPENCV}
+	${CONAN_LIB_DIRS_RVCFRAMEWORK}
+	${CONAN_LIB_DIRS_SPANDSP}
+	${CONAN_LIB_DIRS_SOFIA}
+	${CONAN_LIB_DIRS_SPEEXDSP}
+	${CONAN_LIB_DIRS_LIBKYSM}
+	${CONAN_LIB_DIRS_APR}
+)
+endif(MSVC)
 
 # 添加实体需要依赖的其他共享库(包括系统库)
 if(WIN32)

+ 0 - 5
Other/libaudiomgr/CMakeLists.txt

@@ -22,11 +22,6 @@ set(${MODULE_PREFIX}_SRCS
 
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
-if(NOT WIN32)
-conan_cmake_run(REQUIRES pulseaudio/14.0.1@LR04.02_ThirdParty/dynamic
-BASIC_SETUP CMAKE_TARGETS)
-endif(NOT WIN32)
-
 target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_PULSEAUDIO}
 	)

+ 2 - 2
Other/libwmvrecord/CMakeLists.txt

@@ -15,13 +15,13 @@ set(${MODULE_PREFIX}_SRCS
 
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
-
+message(STATUS "freetype2: ${CONAN_INCLUDE_DIRS_FREETYPE}")
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	"${CONAN_RVCFRAMEWORK_ROOT}/include"
 	${RVC_COMMON_INCLUDE_DIR}
 	${CONAN_INCLUDE_DIRS_FFMPEG}
-	${CONAN_INCLUDE_DIRS_FREETYPE}/freetype2
+	${CONAN_INCLUDE_DIRS_FREETYPE}
 	${CONAN_INCLUDE_DIRS_SPEEXDSP}
     ${CONAN_INCLUDE_DIRS_OPENCV}
     ${CONAN_INCLUDE_DIRS_OPENCV}/opencv

+ 0 - 8
Plugins/MediaDevDetectBasePulse/CMakeLists.txt

@@ -6,14 +6,6 @@ find_package(Qt5 COMPONENTS Widgets REQUIRED
 
 find_package(Qt5UiTools HINTS ${QT5_HINT_PATH} NO_SYSTEM_ENVIRONMENT_PATH )
 
-if(WIN32)
-    conan_cmake_run(REQUIRES portaudio/v190600.20161030@LR04.02_ThirdParty/testing
-    BASIC_SETUP CMAKE_TARGETS)
-else(WIN32)
-    conan_cmake_run(REQUIRES pulseaudio/14.0.1@LR04.02_ThirdParty/dynamic
-    BASIC_SETUP CMAKE_TARGETS)
-endif(WIN32)
-
 set(${MODULE_PREFIX}_SRCS
     mainform.cpp
     mainform.ui

+ 67 - 33
addin/cmake/DependencyConanFiles.cmake

@@ -1,39 +1,73 @@
+set(CONAN_ALLPLATFORM_LIB_NAMES
+	#mod_download mod_evtconverter mod_ThermalPrint
+	expat/2.1.0@LR04.02_ThirdParty/testing
+	#mod_ThermalPrint mod_evtconverter mod_download
+	scew/1.1.7@LR04.02_ThirdParty/testing
+	#mod_snapshot mod_screenshot mod_RomoteController mod_UpgradeRun mod_upload libscreencodec 
+	zlib/1.2.11@LR04.02_ThirdParty/stable
+	#libbizchan mod_screenshot mod_snapshot
+	openjpeg/2.0.0@LR04.02_ThirdParty/testing
+	#mod_snapshot mod_mediacontroller mod_sipphone libvideoqueue
+	IPP/1.0@LR04.02_ThirdParty/testing
+	#mod_sipphone libwmvrecord libaudioframwork mod_mediacontroller libaudiorender
+	SpeexDSP/1.2rc3@LR04.02_ThirdParty/testing 
+	#showdev mod_mediacontroller mod_sipphone libaudioframwork
+	spandsp/0.0.6@LR04.02_ThirdParty/testing
+	#mod_mediacontroller libaudioframwork showdev mod_sipphone
+	lib8k/1.0@LR04.02_ThirdParty/testing
+	#libaudioframwork
+	libtiff/4.0.9@LR04.02_ThirdParty/testing
+	#libwmvrecord
+	freetype/2.10.0@LR04.02_ThirdParty/testing
+	#include/test
+	Catch/2.13.0@LR04.02_ThirdParty/stable
+	#mod_CustMngrAuth mod_uplog
+	jsoncpp/1.9.0@LR04.02_ThirdParty/stable
+	#mod_chromium
+	cefclient/11.0@LR04.02_ThirdParty/testing   
+	#mod_chromium mod_RomoteController mod_rpc
+	boost/1.69.0@LR04.02_ThirdParty/testing
+	#liblog4vendor
+	log4cplus/1.2.1@LR04.02_ThirdParty/slim
+)
+
+
 if(MSVC)
-conan_cmake_run(REQUIRES 
-opencv/3.1.0@LR04.02_ThirdParty/testing               #mod_sipphone mod_IDCertificate libwmvrecord mod_livenessdetection mod_screenshot mod_snapshot libfacecapture libimageproc
-ffmpeg/4.1@LR04.02_ThirdParty/testing                 #mod_sipphone mod_mediacontroller livenessdetection libaudioframwork libmediaplayer libvideocapture libvideoframwork libwmvrecord showdev mod_screenshot mod_snapshot
-apache-apr/1.4.2@LR04.02_ThirdParty/testing           #mod_mediacontroller libaudioframwork mod_sipphone
-SDL2/2.0.9@LR04.02_ThirdParty/testing                 #libpictureplayer libvideorender
-sofia/1.12.11@LR04.02_ThirdParty/testing              #mod_sipphone
-portaudio/v190600.20161030@LR04.02_ThirdParty/testing #mod_sipphone mod_mediacontroller showdev MediaDevDetect libaudioframwork
-BASIC_SETUP CMAKE_TARGETS)
+set(CONAN_CURPLATFORM_LIB_NAMES
+		#mod_sipphone mod_IDCertificate libwmvrecord mod_livenessdetection mod_screenshot mod_snapshot libfacecapture libimageproc
+		opencv/3.1.0@LR04.02_ThirdParty/testing
+		#mod_sipphone mod_mediacontroller livenessdetection libaudioframwork libmediaplayer libvideocapture 
+		#libvideoframwork libwmvrecord showdev mod_screenshot mod_snapshot
+		ffmpeg/4.1@LR04.02_ThirdParty/testing                 
+		# ffmpeg/4.1.6@LR04.02_ThirdParty/shared @huchen
+		#mod_mediacontroller libaudioframwork mod_sipphone
+		apache-apr/1.4.2@LR04.02_ThirdParty/testing
+		#libpictureplayer libvideorender
+		SDL2/2.0.9@LR04.02_ThirdParty/testing
+		#mod_sipphone
+		sofia/1.12.11@LR04.02_ThirdParty/testing
+		 #mod_sipphone mod_mediacontroller showdev MediaDevDetect libaudioframwork
+		portaudio/v190600.20161030@LR04.02_ThirdParty/testing)
 else()
-conan_cmake_run(REQUIRES 
-opencv/3.1.0@LR04.02_ThirdParty/stable                #mod_sipphone mod_IDCertificate libwmvrecord mod_livenessdetection mod_screenshot mod_snapshot libfacecapture libimageproc
-sofia/1.13@LR04.02_ThirdParty/testing                 #mod_sipphone
-apr/1.7.0@LR04.02_ThirdParty/shared                   #mod_mediacontroller libaudioframwork mod_sipphone
-portaudio/v19.0.6@LR04.02_ThirdParty/testing          #mod_sipphone mod_mediacontroller showdev MediaDevDetect
-ffmpeg/4.1.6@LR04.02_ThirdParty/stable                #mod_sipphone mod_mediacontroller livenessdetection libaudioframwork libmediaplayer libvideocapture libvideoframwork libwmvrecord showdev mod_screenshot mod_snapshot
-SDL2/2.0.12@LR04.02_ThirdParty/shared                 #libpictureplayer libvideorender
-libX11/1.6@LR04.02_ThirdParty/testing                 #mod_screenshot
-alsa/1.1.6@LR04.02_ThirdParty/testing                 #showdev MediaDevDetect
-BASIC_SETUP CMAKE_TARGETS)
+set(CONAN_CURPLATFORM_LIB_NAMES
+		#mod_sipphone mod_IDCertificate libwmvrecord mod_livenessdetection mod_screenshot mod_snapshot libfacecapture libimageproc
+		opencv/3.1.0@LR04.02_ThirdParty/stable
+		#mod_sipphone
+		sofia/1.13@LR04.02_ThirdParty/testing
+		#mod_mediacontroller libaudioframwork mod_sipphone
+		apr/1.7.0@LR04.02_ThirdParty/shared
+		#mod_sipphone mod_mediacontroller showdev MediaDevDetect
+		pulseaudio/14.0.1@LR04.02_ThirdParty/dynamic
+		#mod_sipphone mod_mediacontroller livenessdetection libaudioframwork libmediaplayer libvideocapture
+		#libvideoframwork libwmvrecord showdev mod_screenshot mod_snapshot
+		ffmpeg/4.1.6@LR04.02_ThirdParty/stable
+		#libpictureplayer libvideorender
+		SDL2/2.0.12@LR04.02_ThirdParty/shared
+		#mod_screenshot
+		libX11/1.6@LR04.02_ThirdParty/testing)
 endif(MSVC)
 
 conan_cmake_run(REQUIRES 
-expat/2.1.0@LR04.02_ThirdParty/testing      #mod_download mod_evtconverter mod_ThermalPrint 
-scew/1.1.7@LR04.02_ThirdParty/testing       #mod_ThermalPrint mod_evtconverter mod_download
-zlib/1.2.11@LR04.02_ThirdParty/stable       #mod_snapshot mod_screenshot mod_RomoteController mod_UpgradeRun mod_upload libscreencodec 
-openjpeg/2.0.0@LR04.02_ThirdParty/testing   #libbizchan mod_screenshot mod_snapshot
-IPP/1.0@LR04.02_ThirdParty/testing          #mod_snapshot mod_mediacontroller mod_sipphone libvideoqueue
-SpeexDSP/1.2rc3@LR04.02_ThirdParty/testing  #mod_sipphone libwmvrecord libaudioframwork mod_mediacontroller libaudiorender
-spandsp/0.0.6@LR04.02_ThirdParty/testing    #showdev mod_mediacontroller mod_sipphone libaudioframwork
-lib8k/1.0@LR04.02_ThirdParty/testing        #mod_mediacontroller libaudioframwork showdev mod_sipphone
-libtiff/4.0.9@LR04.02_ThirdParty/testing    #libaudioframwork
-freetype/2.10.0@LR04.02_ThirdParty/testing  #libwmvrecord
-Catch/2.13.0@LR04.02_ThirdParty/stable      #include/test
-jsoncpp/1.9.0@LR04.02_ThirdParty/stable     #mod_CustMngrAuth mod_uplog
-cefclient/11.0@LR04.02_ThirdParty/testing   #mod_chromium
-boost/1.69.0@LR04.02_ThirdParty/testing     #mod_chromium mod_RomoteController mod_rpc
-log4cplus/1.2.1@LR04.02_ThirdParty/slim     #liblog4vendor
+	${CONAN_CURPLATFORM_LIB_NAMES}
+	${CONAN_ALLPLATFORM_LIB_NAMES}
 BASIC_SETUP CMAKE_TARGETS)