整理cmake

CMakeLists.txt

@@ -344,7 +344,8 @@ if(OPENSSL_FOUND AND ENABLE_OPENSSL)
   endif()
   endif()
 else()
 else()
   set(ENABLE_OPENSSL OFF)
   set(ENABLE_OPENSSL OFF)
-  message(WARNING "openssl 未找到, rtmp 将不支持 flash 播放器, https/wss/rtsps/rtmps 也将失效")
+  set(ENABLE_WEBRTC OFF)
+  message(WARNING "openssl 未找到, rtmp 将不支持 flash 播放器, https/wss/rtsps/rtmps/webrtc 也将失效")
 endif()
 endif()
 
 
 # 查找 mysql 是否安装
 # 查找 mysql 是否安装
@@ -428,24 +429,30 @@ if(ENABLE_API)
 endif()
 endif()
 
 
 # IOS 不编译可执行程序
 # IOS 不编译可执行程序
-if(NOT IOS)
-  if(ENABLE_PLAYER AND ENABLE_FFMPEG)
-    add_subdirectory(player)
-  endif()
+if(IOS)
+  return()
+endif()
 
 
-  add_subdirectory(server)
-  # Android 会 add_subdirectory 并依赖该变量
-  if(ENABLE_SERVER_LIB)
-    set(MK_LINK_LIBRARIES ${MK_LINK_LIBRARIES} PARENT_SCOPE)
-  endif()
+##############################################################################
 
 
-  # 复制文件过来
-  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/www"
-    DESTINATION ${EXECUTABLE_OUTPUT_PATH})
-  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/conf/config.ini"
-    DESTINATION ${EXECUTABLE_OUTPUT_PATH})
+if(ENABLE_PLAYER AND ENABLE_FFMPEG)
+  add_subdirectory(player)
+endif()
 
 
-  if(ENABLE_TESTS)
-    add_subdirectory(tests)
-  endif()
+#MediaServer主程序
+add_subdirectory(server)
+
+# Android 会 add_subdirectory 并依赖该变量
+if(ENABLE_SERVER_LIB)
+  set(MK_LINK_LIBRARIES ${MK_LINK_LIBRARIES} PARENT_SCOPE)
 endif()
 endif()
+
+#cpp测试demo程序
+if (ENABLE_TESTS)
+  add_subdirectory(tests)
+endif ()
+
+# 拷贝www文件夹、配置文件、默认证书
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/www" DESTINATION ${EXECUTABLE_OUTPUT_PATH})
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/conf/config.ini" DESTINATION ${EXECUTABLE_OUTPUT_PATH})
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/default.pem" DESTINATION ${EXECUTABLE_OUTPUT_PATH})

tests/CMakeLists.txt

@@ -21,7 +21,6 @@
 # SOFTWARE.
 # SOFTWARE.
 #
 #
 
 
-execute_process(COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/default.pem ${EXECUTABLE_OUTPUT_PATH}/)
 aux_source_directory(. TEST_SRC_LIST)
 aux_source_directory(. TEST_SRC_LIST)
 
 
 foreach(TEST_SRC ${TEST_SRC_LIST})
 foreach(TEST_SRC ${TEST_SRC_LIST})