--- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -185,7 +185,7 @@ if (MUE_BUILD_UNIT_TESTS) FULL_DOCS "List XML files outputted by google test." ) - add_subdirectory(thirdparty/googletest) + find_package(GTest REQUIRED) endif(MUE_BUILD_UNIT_TESTS) add_subdirectory(share) --- a/src/framework/audio/CMakeLists.txt +++ b/src/framework/audio/CMakeLists.txt @@ -268,11 +268,18 @@ if (MUE_ENABLE_AUDIO_EXPORT) ${CMAKE_CURRENT_LIST_DIR}/internal/soundtracks/soundtrackwriter.h ) - add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/lame lame) - add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/opusenc opusenc) - add_subdirectory(${PROJECT_SOURCE_DIR}/thirdparty/flac flac) + pkg_check_modules(lame REQUIRED IMPORTED_TARGET lame) + pkg_check_modules(libopusenc REQUIRED IMPORTED_TARGET libopusenc) + pkg_check_modules(flac REQUIRED IMPORTED_TARGET flac) + pkg_check_modules(flacpp REQUIRED IMPORTED_TARGET flac++) - set(MODULE_LINK ${MODULE_LINK} lame opusenc flac) + set(MODULE_LINK + ${MODULE_LINK} + PkgConfig::lame + PkgConfig::libopusenc + PkgConfig::flac + PkgConfig::flacpp + ) endif() if (ARCH_IS_X86_64) --- a/src/framework/audio/internal/encoders/mp3encoder.cpp +++ b/src/framework/audio/internal/encoders/mp3encoder.cpp @@ -22,7 +22,7 @@ #include "mp3encoder.h" -#include "lame.h" +#include "lame/lame.h" using namespace mu; using namespace mu::audio; --- a/src/framework/audio/internal/encoders/oggencoder.cpp +++ b/src/framework/audio/internal/encoders/oggencoder.cpp @@ -22,7 +22,7 @@ #include "oggencoder.h" -#include "opusenc.h" +#include "opus/opusenc.h" #include "log.h" --- a/src/framework/global/CMakeLists.txt +++ b/src/framework/global/CMakeLists.txt @@ -111,8 +111,6 @@ set(MODULE_SRC ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamreader.h ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.cpp ${CMAKE_CURRENT_LIST_DIR}/serialization/xmlstreamwriter.h - ${CMAKE_CURRENT_LIST_DIR}/thirdparty//tinyxml/tinyxml2.cpp - ${CMAKE_CURRENT_LIST_DIR}/thirdparty//tinyxml/tinyxml2.h ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.cpp ${CMAKE_CURRENT_LIST_DIR}/serialization/zipreader.h ${CMAKE_CURRENT_LIST_DIR}/serialization/zipwriter.cpp @@ -130,6 +128,8 @@ set(MODULE_SRC ${CMAKE_CURRENT_LIST_DIR}/concurrency/taskscheduler.h ) +find_package(tinyxml2 REQUIRED) + if (GLOBAL_NO_INTERNAL) set(MODULE_DEF ${MODULE_DEF} -DGLOBAL_NO_INTERNAL) else() @@ -209,6 +209,7 @@ list(APPEND MODULE_INCLUDE list(APPEND MODULE_LINK ${FS_LIB} ${Z_LIB} + tinyxml2::tinyxml2 ) if (MUE_ENABLE_CUSTOM_ALLOCATOR) --- a/src/framework/global/serialization/xmldom.cpp +++ b/src/framework/global/serialization/xmldom.cpp @@ -21,7 +21,7 @@ */ #include "xmldom.h" -#include "thirdparty/tinyxml/tinyxml2.h" +#include #include "log.h" --- a/src/framework/global/serialization/xmlstreamreader.cpp +++ b/src/framework/global/serialization/xmlstreamreader.cpp @@ -23,7 +23,7 @@ #include -#include "thirdparty/tinyxml/tinyxml2.h" +#include #include "log.h" --- a/src/framework/testing/gtest.cmake +++ b/src/framework/testing/gtest.cmake @@ -60,7 +60,7 @@ find_package(Qt5 COMPONENTS Core Gui REQUIRED) target_link_libraries(${MODULE_TEST} Qt5::Core Qt5::Gui - gmock + GTest::gmock global ${MODULE_TEST_LINK} )