Merge pull request #1825 from wasphin/feature/cmake

整理 CMakeLists.txt

api/CMakeLists.txt

@@ -1,38 +1,78 @@
-include_directories(include source)
+# MIT License
+#
+# Copyright (c) 2016-2022 The ZLMediaKit project authors. All Rights Reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
 include(GenerateExportHeader)
-file(GLOB api_src_list include/*.h source/*.cpp source/*.h source/*.c)
+file(GLOB API_SRC_LIST
+  include/*.h
+  source/*.c
+  source/*.cpp
+  source/*.h)
 
-if (IOS)
-    add_library(mk_api STATIC ${api_src_list})
-    target_link_libraries(mk_api ${LINK_LIB_LIST} jsoncpp)
-    return()
+set(LINK_LIBRARIES ${MK_LINK_LIBRARIES} jsoncpp)
+
+if(IOS)
+  add_library(mk_api STATIC ${API_SRC_LIST})
+  target_link_libraries(mk_api
+    PRIVATE ${LINK_LIBRARIES})
+  return()
 endif ()
 
-add_definitions(-DGENERATE_EXPORT)
-include_directories(${CMAKE_BINARY_DIR})
+set(COMPILE_DEFINITIONS ${MK_COMPILE_DEFINITIONS})
+list(APPEND COMPILE_DEFINITIONS GENERATE_EXPORT)
 
-if (ENABLE_API_STATIC_LIB)
-    add_definitions(-DMediaKitApi_STATIC)
-    add_library(mk_api STATIC ${api_src_list})
-else ()
-    add_library(mk_api SHARED ${api_src_list})
-endif ()
+if(ENABLE_API_STATIC_LIB)
+  add_library(mk_api STATIC ${API_SRC_LIST})
+  list(APPEND COMPILE_DEFINITIONS MediaKitApi_STATIC)
+else()
+  add_library(mk_api SHARED ${API_SRC_LIST})
+endif()
 
-if (CMAKE_SYSTEM_NAME MATCHES "Linux")
-    target_link_libraries(mk_api -Wl,--start-group jsoncpp ${LINK_LIB_LIST} -Wl,--end-group)
-else ()
-    target_link_libraries(mk_api jsoncpp ${LINK_LIB_LIST})
-endif ()
+target_compile_definitions(mk_api
+  PRIVATE ${COMPILE_DEFINITIONS})
+target_include_directories(mk_api
+  PRIVATE
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>"
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>"
+  PUBLIC
+    "$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>")
+
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+  target_link_libraries(mk_api -Wl,--start-group ${LINK_LIBRARIES} -Wl,--end-group)
+else()
+  target_link_libraries(mk_api jsoncpp ${LINK_LIBRARIES})
+endif()
 
 generate_export_header(mk_api
-        EXPORT_MACRO_NAME API_EXPORT
-        BASE_NAME MK_API
-        STATIC_DEFINE MediaKitApi_STATIC
-        EXPORT_FILE_NAME "${CMAKE_BINARY_DIR}/mk_export.h"
-        )
+  EXPORT_MACRO_NAME API_EXPORT
+  BASE_NAME MK_API
+  STATIC_DEFINE MediaKitApi_STATIC
+  EXPORT_FILE_NAME "${CMAKE_BINARY_DIR}/mk_export.h")
 
 add_subdirectory(tests)
 
-file(GLOB api_header_list include/*.h ${CMAKE_BINARY_DIR}/*.h)
-install(FILES ${api_header_list} DESTINATION ${INSTALL_PATH_INCLUDE})
-install(TARGETS mk_api ARCHIVE DESTINATION ${INSTALL_PATH_LIB} LIBRARY DESTINATION ${INSTALL_PATH_LIB})
+file(GLOB API_HEADER_LIST include/*.h ${CMAKE_CURRENT_BINARY_DIR}/*.h)
+install(FILES ${API_HEADER_LIST}
+  DESTINATION ${INSTALL_PATH_INCLUDE})
+install(TARGETS mk_api
+  ARCHIVE DESTINATION ${INSTALL_PATH_LIB}
+  LIBRARY DESTINATION ${INSTALL_PATH_LIB})

api/tests/CMakeLists.txt

@@ -1,28 +1,47 @@
-aux_source_directory(. TEST_SRC_LIST)
-include_directories(${PROJECT_BINARY_DIR}/api)
+# MIT License
+#
+# Copyright (c) 2016-2022 The ZLMediaKit project authors. All Rights Reserved.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+#
+
+aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} TEST_SRC_LIST)
 
 foreach(TEST_SRC ${TEST_SRC_LIST})
-    STRING(REGEX REPLACE "^\\./|\\.c[a-zA-Z0-9_]*$" "" TEST_EXE_NAME ${TEST_SRC})
+  get_filename_component(TEST_EXE_NAME ${TEST_SRC} NAME_WE)
 
-    if (NOT ENABLE_FFMPEG)
-        # 过滤掉依赖 FFmpeg 的测试模块
-        if ("${TEST_EXE_NAME}" MATCHES "player_opencv")
-            continue()
-        endif ()
-    endif ()
-
-    message(STATUS "add c api tester:${TEST_EXE_NAME}")
-    set(exe_name api_tester_${TEST_EXE_NAME})
-    add_executable(${exe_name} ${TEST_SRC})
-    if(USE_SOLUTION_FOLDERS)
-        SET_PROPERTY(TARGET ${exe_name} PROPERTY FOLDER "api_test")
+  if(NOT ENABLE_FFMPEG)
+    # 过滤掉依赖 FFmpeg 的测试模块
+    if("${TEST_EXE_NAME}" MATCHES "player_opencv")
+      continue()
     endif()
+  endif()
 
-	if(MSVC)
-		set_target_properties(${exe_name} PROPERTIES COMPILE_FLAGS ${VS_FALGS} )
-	endif()
+  message(STATUS "add c api tester: ${TEST_EXE_NAME}")
+  set(exe_name api_tester_${TEST_EXE_NAME})
+  add_executable(${exe_name} ${TEST_SRC})
+  if(USE_SOLUTION_FOLDERS)
+    set_property(TARGET ${exe_name} PROPERTY FOLDER "api_test")
+  endif()
 
-    target_link_libraries(${exe_name} mk_api)
+  target_link_libraries(${exe_name} mk_api)
+  target_compile_options(${exe_name} PRIVATE ${COMPILE_OPTIONS_DEFAULT})
 endforeach()