mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-11-19 11:10:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Re-arrange include paths to ensure standalone builds use correctly vendored headers.

Browse Source
This commit is contained in:
casey langen 2023-03-25 17:29:19 -07:00
parent 697067fd33
commit 1327ca91cb
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -20,20 +20,24 @@ include(CheckAtomic)
include(AddPlugin) include(AddPlugin)
include(ConfigureRpath) include(ConfigureRpath)
include(ConfigureBsdPaths) include(ConfigureBsdPaths)
include(ConfigureStandalone) if (${BUILD_STANDALONE} MATCHES "true")
include(ConfigureStandalone)
endif()
include(AddDarwinSystemLibs) include(AddDarwinSystemLibs)
include(AddLinuxSystemLibs) include(AddLinuxSystemLibs)
include(ConfigureCurses) include(ConfigureCurses)
include(ConfigureCompilerFlags) include(ConfigureCompilerFlags)
include(FindVendorLibrary) include(FindVendorLibrary)
if (NOT DEFINED ENV{HOMEBREW_PREFIX}) if (NOT DEFINED ENV{HOMEBREW_PREFIX} AND NOT ${BUILD_STANDALONE} MATCHES "true")
find_program(CCACHE_FOUND ccache) find_program(CCACHE_FOUND ccache)
if (CCACHE_FOUND) if (CCACHE_FOUND)
message(STATUS "${BoldGreen}[ccache] ccache enabled!${ColorReset}") message(STATUS "${BoldGreen}[ccache] ccache enabled!${ColorReset}")
set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache) set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
endif(CCACHE_FOUND) endif(CCACHE_FOUND)
else()
message(STATUS "${BoldYellow}[ccache] disabled; homebrew or standalone build detected.${ColorReset}")
endif() endif()
if (CROSS_COMPILE_SYSROOT) if (CROSS_COMPILE_SYSROOT)

1
src/plugins/ffmpegdecoder/CMakeLists.txt
View File

@ -6,6 +6,7 @@ add_library(ffmpegdecoder SHARED ${ffmpegdecoder_SOURCES})
if (${BUILD_STANDALONE} MATCHES "true") if (${BUILD_STANDALONE} MATCHES "true")
include_directories(BEFORE ${VENDOR_INCLUDE_DIRECTORIES}) include_directories(BEFORE ${VENDOR_INCLUDE_DIRECTORIES})
message(STATUS "[ffmpegdecoder] using include dirs: ${VENDOR_INCLUDE_DIRECTORIES}")
find_vendor_library(AVCODEC avcodec-musikcube) find_vendor_library(AVCODEC avcodec-musikcube)
find_vendor_library(AVUTIL avutil-musikcube) find_vendor_library(AVUTIL avutil-musikcube)
find_vendor_library(AVFORMAT avformat-musikcube) find_vendor_library(AVFORMAT avformat-musikcube)