sam/sfizz
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CMake: 3.13 as minimum for non Windows platforms, plus minor fixes

Browse source
This commit is contained in:
redtide 2023-05-23 12:27:31 +02:00
parent 206786447e
commit 899e988c8c
No known key found for this signature in database
3 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -2,7 +2,8 @@ if(WIN32)
cmake_minimum_required(VERSION 3.15) cmake_minimum_required(VERSION 3.15)
cmake_policy(SET CMP0091 NEW) cmake_policy(SET CMP0091 NEW)
else() else()
cmake_minimum_required(VERSION 3.12) # USE_LIBCPP requires add_link_options() in SfizzConfig.cmake
cmake_minimum_required(VERSION 3.13)
endif() endif()
project(libsfizz project(libsfizz

7
cmake/SfizzConfig.cmake
View file

@ -117,15 +117,16 @@ cmake_dependent_option(USE_LIBCPP "Use libc++ with clang" "${APPLE}"
"CMAKE_CXX_COMPILER_ID MATCHES Clang" OFF) "CMAKE_CXX_COMPILER_ID MATCHES Clang" OFF)
if(USE_LIBCPP) if(USE_LIBCPP)
add_compile_options(-stdlib=libc++) add_compile_options(-stdlib=libc++)
# Presumably need the above for linking too, maybe other options missing as well add_link_options(-stdlib=libc++) # New command in CMake 3.13
add_link_options(-stdlib=libc++) # New command on CMake master, not in 3.12 release add_link_options(-lc++abi)
add_link_options(-lc++abi) # New command on CMake master, not in 3.12 release
endif() endif()
include(GNUInstallDirs) include(GNUInstallDirs)
if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) if(PROJECT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
set(PROJECT_IS_MAIN TRUE) set(PROJECT_IS_MAIN TRUE)
else()
set(PROJECT_IS_MAIN FALSE)
endif() endif()
# Don't show build information when building a different project # Don't show build information when building a different project

7
src/CMakeLists.txt
View file

@ -330,7 +330,12 @@ if(SFIZZ_SHARED)
target_include_directories(sfizz_shared PUBLIC .) target_include_directories(sfizz_shared PUBLIC .)
target_link_libraries(sfizz_shared PRIVATE sfizz::internal) target_link_libraries(sfizz_shared PRIVATE sfizz::internal)
target_compile_definitions(sfizz_shared PRIVATE SFIZZ_EXPORT_SYMBOLS) target_compile_definitions(sfizz_shared PRIVATE SFIZZ_EXPORT_SYMBOLS)
set_target_properties(sfizz_shared PROPERTIES VERSION "${PROJECT_VERSION}" SOVERSION "${PROJECT_VERSION_MAJOR}" OUTPUT_NAME "sfizz" PUBLIC_HEADER "sfizz.h;sfizz.hpp;sfizz_message.h") set_target_properties(sfizz_shared PROPERTIES
VERSION "${PROJECT_VERSION}"
SOVERSION "${PROJECT_VERSION_MAJOR}"
OUTPUT_NAME "sfizz"
PUBLIC_HEADER "sfizz.h;sfizz.hpp;sfizz_message.h"
)
sfizz_enable_lto_if_needed(sfizz_shared) sfizz_enable_lto_if_needed(sfizz_shared)
if(NOT MSVC) if(NOT MSVC)