M .gitmodules => .gitmodules +1 -1
@@ 37,7 37,7 @@
path = third-party/date
url = ../date.git
[submodule "module-utils/taglib"]
- path = module-utils/taglib
+ path = third-party/taglib
url = ../taglib.git
branch = rt1051
[submodule "module-bluetooth/lib/btstack"]
M CMakeLists.txt => CMakeLists.txt +2 -2
@@ 150,6 150,8 @@ target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_INCLUDES})
target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_BINARY_DIR})
+add_subdirectory(third-party)
+
if (${PROJECT_TARGET} STREQUAL "TARGET_Linux")
add_subdirectory(board/linux/libiosyscalls)
endif()
@@ 192,8 194,6 @@ add_subdirectory(module-bluetooth)
message("${PROJECT_NAME}: add_subdirectory module-lwip")
add_subdirectory(module-lwip)
-add_subdirectory(third-party)
-
add_subdirectory(image)
set_target_properties(${CMAKE_PROJECT_NAME} PROPERTIES SUFFIX ".elf")
M cmake/modules/PureCoverage.cmake => cmake/modules/PureCoverage.cmake +0 -2
@@ 33,10 33,8 @@ if(COVERAGE_ENABLE)
module-utils/libphonenumber/.*
module-utils/re2/.*
module-utils/segger/.*
- module-utils/taglib/.*
source/main.cpp
test/.*
- third-party/.*
)
SET(GCOVR_ADDITIONAL_ARGS
M module-audio/CMakeLists.txt => module-audio/CMakeLists.txt +1 -1
@@ 49,7 49,7 @@ target_sources(
${CMAKE_CURRENT_SOURCE_DIR}/Audio/transcode/TransformFactory.cpp
${CMAKE_CURRENT_SOURCE_DIR}/Audio/VolumeScaler.cpp
)
-target_include_directories(${PROJECT_NAME} PRIVATE ${TAGLIB_INCLUDE_DIRS})
+
target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS})
target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_TARGET})
target_compile_definitions(${PROJECT_NAME} PUBLIC ${TARGET_COMPILE_DEFINITIONS})
M module-services/service-fileindexer/CMakeLists.txt => module-services/service-fileindexer/CMakeLists.txt +0 -2
@@ 5,8 5,6 @@ project(service-fileindexer VERSION 1.0
add_library(${PROJECT_NAME} STATIC ${SOURCES} ${BOARD_SOURCES})
-target_include_directories( ${PROJECT_NAME} PRIVATE ${TAGLIB_INCLUDE_DIRS} )
-
# Board specific compilation definitions,options,include directories and features
target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_CONFIG_DEFINITIONS})
target_compile_definitions(${PROJECT_NAME} PUBLIC ${PROJECT_TARGET})
M module-utils/CMakeLists.txt => module-utils/CMakeLists.txt +0 -8
@@ 55,14 55,6 @@ include(third-party/libphonenumber.cmake)
# link against libphonenumber
target_link_libraries (${PROJECT_NAME} PUBLIC ${LIBPHONENUMBER_TARGET})
-add_subdirectory(taglib EXCLUDE_FROM_ALL)
-set( TAGLIB_INCLUDE_DIRS
- "${CMAKE_CURRENT_SOURCE_DIR}/taglib/taglib/toolkit"
- "${CMAKE_CURRENT_SOURCE_DIR}/taglib/taglib"
- "${CMAKE_CURRENT_BINARY_DIR}/taglib"
- PARENT_SCOPE
-)
-
target_link_libraries(${PROJECT_NAME} PRIVATE crc32 )
# link against tinyexpr
D module-utils/taglib => module-utils/taglib +0 -1
@@ 1,1 0,0 @@
-Subproject commit 351dd5f5c8ad2fa95b483bee2505b8e926a21873
M third-party/CMakeLists.txt => third-party/CMakeLists.txt +3 -0
@@ 1,10 1,13 @@
+
add_subdirectory(crc32)
add_subdirectory(magic_enum)
add_subdirectory(microtar)
add_subdirectory(date)
add_subdirectory(pugixml)
add_subdirectory(sml)
+add_subdirectory(taglib)
add_subdirectory(minimp3)
add_subdirectory(tinyexpr)
add_subdirectory(parallel-hashmap)
add_subdirectory(protobuf)
+
A third-party/taglib => third-party/taglib +1 -0
@@ 0,0 1,1 @@
+Subproject commit 88ec9107c210eb19aaef4e1153460a754578197b