LADI
/
carla
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup cmake side 

Signed-off-by: falkTX <falktx@falktx.com>
This commit is contained in:
falkTX 2023-05-24 02:38:01 +02:00
parent bfa3c74c84
commit 9d54dbee9d
No known key found for this signature in database
GPG Key ID: CDBAA37ABC74FBA0
1 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cmake/CMakeLists.txt
View File

@ -25,8 +25,6 @@ if(NOT (APPLE OR HAIKU OR WIN32))
set(CARLA_LIBRT rt) set(CARLA_LIBRT rt)
endif() endif()
# set(carla_pthread_libs ${CMAKE_THREAD_LIBS_INIT})
####################################################################################################################### #######################################################################################################################
# optional dependencies # optional dependencies
@ -169,6 +167,8 @@ set_common_target_properties(carla-lilv_serd)
target_compile_options(carla-lilv_serd target_compile_options(carla-lilv_serd
PRIVATE PRIVATE
$<$<BOOL:${MSVC}>:/wd4005 /wd4090 /wd4133> $<$<BOOL:${MSVC}>:/wd4005 /wd4090 /wd4133>
$<$<C_COMPILER_ID:GNU>:-Wno-format-overflow>
$<$<C_COMPILER_ID:GNU>:-Wno-implicit-fallthrough>
) )
target_include_directories(carla-lilv_serd target_include_directories(carla-lilv_serd
@ -191,6 +191,7 @@ set_common_target_properties(carla-lilv_sord)
target_compile_options(carla-lilv_sord target_compile_options(carla-lilv_sord
PRIVATE PRIVATE
$<$<BOOL:${MSVC}>:/wd4005 /wd4090 /wd4133> $<$<BOOL:${MSVC}>:/wd4005 /wd4090 /wd4133>
$<$<C_COMPILER_ID:GNU>:-Wno-unused-parameter>
# workaround compiler bug, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109585 # workaround compiler bug, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109585
$<$<C_COMPILER_ID:GNU>:-fno-strict-aliasing> $<$<C_COMPILER_ID:GNU>:-fno-strict-aliasing>
) )
@ -248,7 +249,10 @@ set_common_target_properties(carla-lilv_lilv)
target_compile_options(carla-lilv_lilv target_compile_options(carla-lilv_lilv
PRIVATE PRIVATE
$<$<BOOL:${MSVC}>:/wd4005 /wd4090 /wd4133> $<$<BOOL:${MSVC}>:/wd4005 /wd4090 /wd4133>
$<$<C_COMPILER_ID:GNU>:-Wno-deprecated-declarations -Wno-discarded-qualifiers> $<$<C_COMPILER_ID:GNU>:-Wno-deprecated-declarations>
$<$<C_COMPILER_ID:GNU>:-Wno-discarded-qualifiers>
$<$<C_COMPILER_ID:GNU>:-Wno-format-overflow>
$<$<C_COMPILER_ID:GNU>:-Wno-unused-parameter>
$<$<C_COMPILER_ID:AppleClang>:-Wno-incompatible-pointer-types-discards-qualifiers> $<$<C_COMPILER_ID:AppleClang>:-Wno-incompatible-pointer-types-discards-qualifiers>
) )
@ -480,10 +484,12 @@ target_compile_definitions(carla-ysfx
target_compile_options(carla-ysfx target_compile_options(carla-ysfx
PRIVATE PRIVATE
$<$<C_COMPILER_ID:GNU>:-fsigned-char> $<$<C_COMPILER_ID:GNU>:-fsigned-char>
$<$<C_COMPILER_ID:GNU>:-Wno-extra>
$<$<C_COMPILER_ID:GNU>:-Wno-ignored-attributes> $<$<C_COMPILER_ID:GNU>:-Wno-ignored-attributes>
$<$<C_COMPILER_ID:GNU>:-Wno-sign-compare> $<$<C_COMPILER_ID:GNU>:-Wno-sign-compare>
$<$<C_COMPILER_ID:GNU>:-Wno-unused-function> $<$<C_COMPILER_ID:GNU>:-Wno-unused-function>
$<$<C_COMPILER_ID:GNU>:-Wno-unused-parameter> $<$<C_COMPILER_ID:GNU>:-Wno-unused-parameter>
$<$<CXX_COMPILER_ID:GNU>:-Wno-deprecated-copy>
) )
target_include_directories(carla-ysfx target_include_directories(carla-ysfx
@ -561,6 +567,15 @@ target_compile_definitions(carla-bridge-native
CARLA_LIB_EXT="${CMAKE_SHARED_LIBRARY_SUFFIX}" CARLA_LIB_EXT="${CMAKE_SHARED_LIBRARY_SUFFIX}"
) )
# FIXME
target_compile_options(carla-bridge-native
PRIVATE
$<$<C_COMPILER_ID:GNU>:-Wno-format-truncation>
$<$<C_COMPILER_ID:GNU>:-Wno-stringop-overflow>
$<$<C_COMPILER_ID:GNU>:-Wno-unused-parameter>
$<$<C_COMPILER_ID:GNU>:-Wno-vla>
)
target_include_directories(carla-bridge-native target_include_directories(carla-bridge-native
PRIVATE PRIVATE
../source ../source
@ -670,6 +685,7 @@ set_common_target_properties(carla-utils)
target_include_directories(carla-utils target_include_directories(carla-utils
PRIVATE PRIVATE
../source
../source/backend ../source/backend
../source/includes ../source/includes
../source/modules ../source/modules
@ -688,6 +704,7 @@ target_link_libraries(carla-utils
target_sources(carla-utils target_sources(carla-utils
PRIVATE PRIVATE
../source/backend/utils/CachedPlugins.cpp ../source/backend/utils/CachedPlugins.cpp
../source/backend/utils/CarlaUtils.cpp
../source/backend/utils/Information.cpp ../source/backend/utils/Information.cpp
../source/backend/utils/JUCE.cpp ../source/backend/utils/JUCE.cpp
../source/backend/utils/PipeClient.cpp ../source/backend/utils/PipeClient.cpp
@ -697,7 +714,10 @@ target_sources(carla-utils
) )
if(APPLE) if(APPLE)
set_source_files_properties(../source/backend/utils/Windows.cpp PROPERTIES COMPILE_FLAGS -ObjC++) set_source_files_properties(
../source/backend/utils/CarlaUtils.cpp
../source/backend/utils/Windows.cpp
PROPERTIES COMPILE_FLAGS -ObjC++)
endif() endif()
####################################################################################################################### #######################################################################################################################