@@ -140,15 +140,15 @@ if(CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
140
140
endif ()
141
141
142
142
# Add definitions for static/style library
143
- OPTION (OPTION_STATIC "Build statically" OFF )
144
- MESSAGE ("Build statically: ${OPTION_STATIC } " )
145
- IF (OPTION_STATIC )
143
+ OPTION (OPTION_RABBITIM_USE_STATIC "Build statically" OFF )
144
+ MESSAGE ("Build statically: ${OPTION_RABBITIM_USE_STATIC } " )
145
+ IF (OPTION_RABBITIM_USE_STATIC )
146
146
ADD_DEFINITIONS (-DQT_STATIC)
147
147
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static" )
148
148
set (CMAKE_LD_FLAGS "${CMAKE_LD_FLAGS} -static" )
149
- ELSE (OPTION_STATIC )
149
+ ELSE (OPTION_RABBITIM_USE_STATIC )
150
150
ADD_DEFINITIONS (-DQT_SHARED)
151
- ENDIF (OPTION_STATIC )
151
+ ENDIF (OPTION_RABBITIM_USE_STATIC )
152
152
153
153
IF (CMAKE_BUILD_TYPE MATCHES Debug)
154
154
ADD_DEFINITIONS (-DDEBUG)# -DDEBUG_VIDEO_TIME )
@@ -160,7 +160,7 @@ IF(MSVC)
160
160
SET (RABBITIM_SYSTEM windows)
161
161
SET (TOOLCHAIN_NAME windows_msvc)
162
162
SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4819" ) #删除不是GBK字符的警告
163
- SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:libcmtd /NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS, \" 5.01\" " )
163
+ SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:libcmtd /NODEFAULTLIB:libcmt /SUBSYSTEM:WINDOWS\" , 5.01\" " )
164
164
ELSEIF (MINGW)
165
165
SET (RABBITIM_SYSTEM windows)
166
166
SET (TOOLCHAIN_NAME windows_mingw)
@@ -187,6 +187,9 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}
187
187
${CMAKE_SOURCE_DIR} /ThirdLibary/${TOOLCHAIN_NAME} /include )
188
188
189
189
SET (THIRD_PACKAGE_DIR ${CMAKE_SOURCE_DIR} /ThirdLibary/${TOOLCHAIN_NAME} ) #第三方开发包目录
190
+ IF (OPTION_RABBITIM_USE_STATIC AND EXISTS "${THIRD_PACKAGE_DIR} _static" )
191
+ SET (THIRD_PACKAGE_DIR ${THIRD_PACKAGE_DIR} _static)
192
+ ENDIF ()
190
193
SET (THIRD_LIB_DIR ${THIRD_PACKAGE_DIR} /lib) #第三方库目录
191
194
LINK_DIRECTORIES (${THIRD_LIB_DIR} )
192
195
@@ -247,12 +250,12 @@ IF(OPTION_RABBITIM_USE_SPEEX)
247
250
ENDIF (OPTION_RABBITIM_USE_SPEEX)
248
251
249
252
#增加检测ffmpeg库
250
- OPTION (OPTION_RABBITIM_USER_FFMPEG "Use ffmpeg library" ON )
251
- IF (OPTION_RABBITIM_USER_FFMPEG )
252
- SET (RABBITIM_USER_FFMPEG ON )
253
+ OPTION (OPTION_RABBITIM_USE_FFMPEG "Use ffmpeg library" ON )
254
+ IF (OPTION_RABBITIM_USE_FFMPEG )
255
+ SET (RABBITIM_USE_FFMPEG ON )
253
256
SET (RABBITIM_PACKAGE_REQUIRES "${RABBITIM_PACKAGE_REQUIRES} , libavcodec-dev, libavformat-dev, libavutil-dev, libswscale-dev" )
254
257
255
- ADD_DEFINITIONS ("-D__STDC_CONSTANT_MACROS" "-DRABBITIM_USER_FFMPEG " ) #ffmpeg需要
258
+ ADD_DEFINITIONS ("-D__STDC_CONSTANT_MACROS" "-DRABBITIM_USE_FFMPEG " ) #ffmpeg需要
256
259
IF (PKG_CONFIG_FOUND)
257
260
find_package (FFMPEG REQUIRED COMPONENTS avcodec avformat avutil swscale)
258
261
IF (FFMPEG_FOUND)
@@ -263,37 +266,37 @@ IF(OPTION_RABBITIM_USER_FFMPEG)
263
266
FIND_LIBRARY (FFMPEG_LIBRARIES NAMES avcodec avformat avutil swscale swresample x264 pthread)
264
267
ENDIF (PKG_CONFIG_FOUND)
265
268
266
- ENDIF (OPTION_RABBITIM_USER_FFMPEG )
267
- MESSAGE ("Use ffmpeg library:${RABBITIM_USER_FFMPEG } \n " )
269
+ ENDIF (OPTION_RABBITIM_USE_FFMPEG )
270
+ MESSAGE ("Use ffmpeg library:${RABBITIM_USE_FFMPEG } \n " )
268
271
269
272
#增加检测opencv库
270
- OPTION (OPTION_RABBITIM_USER_OPENCV "Use opencv library" ON )
271
- SET (RABBITIM_USER_OPENCV OFF )
272
- IF (OPTION_RABBITIM_USER_OPENCV )
273
+ OPTION (OPTION_RABBITIM_USE_OPENCV "Use opencv library" ON )
274
+ SET (RABBITIM_USE_OPENCV OFF )
275
+ IF (OPTION_RABBITIM_USE_OPENCV )
273
276
274
277
find_package (OpenCV COMPONENTS core imgproc video) # videoio)
275
278
IF (OpenCV_FOUND)
276
- SET (RABBITIM_USER_OPENCV ON )
279
+ SET (RABBITIM_USE_OPENCV ON )
277
280
INCLUDE_DIRECTORIES ("${OpenCV_INCLUDE_DIRS} " )
278
281
LINK_DIRECTORIES (${OpenCV_LIB_DIR} )
279
282
ENDIF ()
280
283
281
- ELSEIF (OPTION_RABBITIM_USER_OPENCV )
284
+ ELSEIF (OPTION_RABBITIM_USE_OPENCV )
282
285
IF (ANDROID)
283
- message ("android must opencv library, please install library, and -DOPTION_RABBITIM_USER_OPENCV =ON" )
286
+ message ("android must opencv library, please install library, and -DOPTION_RABBITIM_USE_OPENCV =ON" )
284
287
ENDIF (ANDROID)
285
- ENDIF (OPTION_RABBITIM_USER_OPENCV )
286
- IF (RABBITIM_USER_OPENCV )
287
- add_definitions ("-DRABBITIM_USER_OPENCV " )
288
- ENDIF (RABBITIM_USER_OPENCV )
289
- MESSAGE ("Use opencv library:${RABBITIM_USER_OPENCV } \n " )
288
+ ENDIF (OPTION_RABBITIM_USE_OPENCV )
289
+ IF (RABBITIM_USE_OPENCV )
290
+ add_definitions ("-DRABBITIM_USE_OPENCV " )
291
+ ENDIF (RABBITIM_USE_OPENCV )
292
+ MESSAGE ("Use opencv library:${RABBITIM_USE_OPENCV } \n " )
290
293
291
294
#检测openssl库
292
- OPTION (OPTION_RABBITIM_USER_OPENSSL "Use openssl library" ON )
293
- SET (RABBITIM_USER_OPENSSL OFF )
294
- IF (OPTION_RABBITIM_USER_OPENSSL )
295
- SET (RABBITIM_USER_OPENSSL ON )
296
- ADD_DEFINITIONS ("-DRABBITIM_USER_OPENSSL " )
295
+ OPTION (OPTION_RABBITIM_USE_OPENSSL "Use openssl library" ON )
296
+ SET (RABBITIM_USE_OPENSSL OFF )
297
+ IF (OPTION_RABBITIM_USE_OPENSSL )
298
+ SET (RABBITIM_USE_OPENSSL ON )
299
+ ADD_DEFINITIONS ("-DRABBITIM_USE_OPENSSL " )
297
300
SET (RABBITIM_PACKAGE_REQUIRES "${RABBITIM_PACKAGE_REQUIRES} , libssl-dev" )
298
301
299
302
IF (PKG_CONFIG_FOUND AND NOT MSVC )
@@ -302,27 +305,27 @@ IF(OPTION_RABBITIM_USER_OPENSSL)
302
305
message ("OPENSSL_CFLAGS:${OPENSSL_CFLAGS} " )
303
306
add_compile_options (${OPENSSL_CFLAGS} )
304
307
ELSE (OPENSSL_FOUND)
305
- SET (RABBITIM_USER_OPENSSL OFF )
308
+ SET (RABBITIM_USE_OPENSSL OFF )
306
309
ENDIF (OPENSSL_FOUND)
307
310
ELSE ()
308
311
find_package (OpenSSL)
309
312
IF (OPENSSL_FOUND)
310
313
message ("OPENSSL_INCLUDE_DIR:${OPENSSL_INCLUDE_DIR} " )
311
314
include_directories (${OPENSSL_INCLUDE_DIR} )
312
315
ELSE (OPENSSL_FOUND)
313
- SET (RABBITIM_USER_OPENSSL OFF )
316
+ SET (RABBITIM_USE_OPENSSL OFF )
314
317
ENDIF (OPENSSL_FOUND)
315
318
ENDIF ()
316
319
317
- ENDIF (OPTION_RABBITIM_USER_OPENSSL )
318
- MESSAGE ("Use openssl library:${RABBITIM_USER_OPENSSL } \n " )
320
+ ENDIF (OPTION_RABBITIM_USE_OPENSSL )
321
+ MESSAGE ("Use openssl library:${RABBITIM_USE_OPENSSL } \n " )
319
322
320
323
#检测libcurl库
321
- OPTION (OPTION_RABBITIM_USER_LIBCURL "Use curl library" ON )
322
- SET (RABBITIM_USER_LIBCURL OFF )
323
- IF (OPTION_RABBITIM_USER_LIBCURL )
324
- SET (RABBITIM_USER_LIBCURL ON )
325
- add_definitions ("-DRABBITIM_USER_LIBCURL " )
324
+ OPTION (OPTION_RABBITIM_USE_LIBCURL "Use curl library" ON )
325
+ SET (RABBITIM_USE_LIBCURL OFF )
326
+ IF (OPTION_RABBITIM_USE_LIBCURL )
327
+ SET (RABBITIM_USE_LIBCURL ON )
328
+ add_definitions ("-DRABBITIM_USE_LIBCURL " )
326
329
SET (RABBITIM_PACKAGE_REQUIRES "${RABBITIM_PACKAGE_REQUIRES} , libcurl4-openssl-dev" )
327
330
328
331
IF (PKG_CONFIG_FOUND AND NOT MSVC )
@@ -331,34 +334,37 @@ IF(OPTION_RABBITIM_USER_LIBCURL)
331
334
message ("CURL_CFLAGS:${CURL_CFLAGS} " )
332
335
add_compile_options (${CURL_CFLAGS} )
333
336
ELSE (CURL_FOUND)
334
- SET (RABBITIM_USER_LIBCURL OFF )
337
+ SET (RABBITIM_USE_LIBCURL OFF )
335
338
ENDIF (CURL_FOUND)
336
339
ELSE ()
337
340
find_package (CURL)
338
341
if (CURL_FOUND)
339
342
message ("CURL_INCLUDE_DIR:${CURL_INCLUDE_DIR} " )
340
343
include_directories (${CURL_INCLUDE_DIR} )
341
344
ELSE (CURL_FOUND)
342
- SET (RABBITIM_USER_LIBCURL OFF )
345
+ SET (RABBITIM_USE_LIBCURL OFF )
343
346
endif (CURL_FOUND)
344
347
ENDIF ()
345
348
346
- ENDIF (OPTION_RABBITIM_USER_LIBCURL )
347
- MESSAGE ("Use curl library:${RABBITIM_USER_LIBCURL } \n " )
349
+ ENDIF (OPTION_RABBITIM_USE_LIBCURL )
350
+ MESSAGE ("Use curl library:${RABBITIM_USE_LIBCURL } \n " )
348
351
349
352
#qxmpp库
350
353
#连接静态QXMPP库时,必须加上-DQXMPP_STATIC。生成静态QXMPP库时,qmake 需要加上 QXMPP_LIBRARY_TYPE=staticlib 参数
351
354
ADD_DEFINITIONS ("-DQXMPP" ) # -DQXMPP_STATIC")
355
+ IF (OPTION_RABBITIM_USE_STATIC)
356
+ ADD_DEFINITIONS ("-DQXMPP_STATIC" )
357
+ ENDIF ()
352
358
IF (ANDROID)
353
359
ADD_DEFINITIONS ("-DQXMPP_STATIC" )
354
360
ENDIF (ANDROID)
355
361
IF (PKG_CONFIG_FOUND AND NOT MSVC )
356
362
pkg_check_modules(QXMPP REQUIRED qxmpp)
357
363
IF (QXMPP_FOUND)
358
- add_compile_options (${QXMPP_CFLAGS} )
364
+ add_compile_options (${QXMPP_CFLAGS} )
359
365
ENDIF (QXMPP_FOUND)
360
366
ELSE ()
361
- IF (OPTION_STATIC )
367
+ IF (OPTION_RABBITIM_USE_STATIC )
362
368
FIND_LIBRARY (QXMPP_LIBRARIES qxmpp)
363
369
ELSE ()
364
370
FIND_LIBRARY (QXMPP_LIBRARIES qxmpp0)
0 commit comments