diff options
author | Vitaly Kirsanov <krokoziabla@gmail.com> | 2019-04-25 14:14:28 +0000 |
---|---|---|
committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2019-05-04 11:41:48 +1000 |
commit | a82a014cf14cb58280b20106a2e919ba1c48e0e6 (patch) | |
tree | b79dd7f7507b4b730464acc7981fc6436ab36d1d /src | |
parent | d38b867f68de55c0f2b38cedadb85fe8636c5527 (diff) | |
download | flac-a82a014cf14cb58280b20106a2e919ba1c48e0e6.tar.gz |
CMake minimum required lowered to 3.1
Diffstat (limited to 'src')
-rw-r--r-- | src/CMakeLists.txt | 11 | ||||
-rw-r--r-- | src/flac/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/libFLAC++/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/libFLAC/CMakeLists.txt | 47 | ||||
-rw-r--r-- | src/share/getopt/CMakeLists.txt | 10 |
5 files changed, 25 insertions, 51 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f6577467..da556d89 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,16 +1,9 @@ -cmake_minimum_required(VERSION 3.12) +cmake_minimum_required(VERSION 3.0) option(ENABLE_64_BIT_WORDS "Set FLAC__BYTES_PER_WORD to 8 (4 is the default)" OFF) option(WITH_XMMS "Build XMMS plugin" OFF) -check_include_file("iconv.h" HAVE_ICONV_H) - -add_compile_definitions( - ENABLE_64_BIT_WORDS=$<BOOL:${ENABLE_64_BIT_WORDS}> - FLAC__HAS_OGG=$<BOOL:${OGG_FOUND}> - WORDS_BIGENDIAN=$<BOOL:${CPU_IS_BIG_ENDIAN}> - $<$<BOOL:${HAVE_ICONV_H}>:HAVE_ICONV> - $<$<BOOL:${HAVE_SYS_PARAM_H}>:HAVE_SYS_PARAM_H>) +check_include_file("iconv.h" HAVE_ICONV) add_subdirectory("libFLAC") if(BUILD_CXXLIBS) diff --git a/src/flac/CMakeLists.txt b/src/flac/CMakeLists.txt index 3fb2e2f7..6275aca2 100644 --- a/src/flac/CMakeLists.txt +++ b/src/flac/CMakeLists.txt @@ -1,12 +1,6 @@ -cmake_minimum_required(VERSION 3.12) - check_include_file("sys/ioctl.h" HAVE_SYS_IOCTL_H) check_include_file("termios.h" HAVE_TERMIOS_H) -add_compile_definitions( - $<$<BOOL:${HAVE_SYS_IOCTL_H}>:HAVE_SYS_IOCTL_H> - $<$<BOOL:${HAVE_TERMIOS_H}>:HAVE_TERMIOS_H>) - add_executable(flac analyze.c decode.c diff --git a/src/libFLAC++/CMakeLists.txt b/src/libFLAC++/CMakeLists.txt index e73ffcb1..71c9629b 100644 --- a/src/libFLAC++/CMakeLists.txt +++ b/src/libFLAC++/CMakeLists.txt @@ -18,8 +18,6 @@ check_cxx_source_compiles(" #endif" HAVE_CXX_VARARRAYS) -add_compile_definitions($<$<BOOL:${HAVE_CXX_VARARRAYS}>:HAVE_CXX_VARARRAYS>) - set(SOURCES metadata.cpp stream_decoder.cpp diff --git a/src/libFLAC/CMakeLists.txt b/src/libFLAC/CMakeLists.txt index 17d940bd..b6d59ae3 100644 --- a/src/libFLAC/CMakeLists.txt +++ b/src/libFLAC/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.12) +cmake_minimum_required(VERSION 3.0) if(CMAKE_SYSTEM_PROCESSOR MATCHES "[xX]86(_64)?|(AMD|amd)64|i[346]86") option(WITH_AVX "Enable AVX, AVX2 optimizations" ON) @@ -12,36 +12,25 @@ check_include_file("sys/param.h" HAVE_SYS_PARAM_H) set(CMAKE_REQUIRED_LIBRARIES m) check_function_exists(lround HAVE_LROUND) -add_compile_definitions( - $<$<BOOL:${MSVC}>:_USE_MATH_DEFINES> - FLAC__USE_AVX=$<BOOL:${WITH_AVX}> - HAVE_LROUND=$<BOOL:${HAVE_LROUND}> - $<$<BOOL:${HAVE_CPUID_H}>:HAVE_CPUID_H> - $<$<OR:$<CONFIG:Debug>,$<CONFIG:RelWithDebInfo>>:FLAC__OVERFLOW_DETECT>) - if(CMAKE_SYSTEM_PROCESSOR MATCHES "[xX]86_64|(AMD|amd)64") if(CMAKE_SIZEOF_VOID_P EQUAL 4) set(IA32 TRUE) endif() - add_compile_definitions( - FLAC__CPU_X86_64 - FLAC__ALIGN_MALLOC_DATA) + add_definitions(-DFLAC__CPU_X86_64 -DFLAC__ALIGN_MALLOC_DATA) elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "([xX]|i[346])86") set(IA32 TRUE) - add_compile_definitions( - FLAC__CPU_IA32 - FLAC__ALIGN_MALLOC_DATA) + add_definitions(-DFLAC__CPU_IA32 -DFLAC__ALIGN_MALLOC_DATA) endif() include(CheckLanguage) check_language(ASM_NASM) if(CMAKE_ASM_NASM_COMPILER) enable_language(ASM_NASM) - add_compile_definitions(FLAC__HAS_NASM) + add_definitions(-DFLAC__HAS_NASM) endif() if(NOT WITH_ASM) - add_compile_definitions(FLAC__NO_ASM) + add_definitions(-DFLAC__NO_ASM) endif() if(IA32) @@ -106,10 +95,13 @@ target_compile_definitions(FLAC-static PUBLIC FLAC__NO_DLL) target_include_directories(FLAC-static INTERFACE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>" "$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>") -target_link_libraries(FLAC-static PUBLIC - $<TARGET_NAME_IF_EXISTS:win_utf8_io> - $<TARGET_NAME_IF_EXISTS:FLAC-asm> - $<$<BOOL:${HAVE_LROUND}>:m>) +target_link_libraries(FLAC-static PUBLIC $<$<BOOL:${HAVE_LROUND}>:m>) +if(TARGET FLAC-asm) + target_link_libraries(FLAC-static PUBLIC FLAC-asm>) +endif() +if(TARGET win_utf8_io) + target_link_libraries(FLAC-static PUBLIC win_utf8_io>) +endif() if(TARGET Ogg::Ogg-static) target_link_libraries(FLAC-static PUBLIC Ogg::Ogg-static) elseif(TARGET Ogg::Ogg) @@ -121,11 +113,16 @@ target_compile_definitions(FLAC PRIVATE FLAC_API_EXPORTS FLAC__USE_VISIBILITY_AT target_include_directories(FLAC INTERFACE "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>" "$<INSTALL_INTERFACE:${CMAKE_INSTALL_PREFIX}/include>") -target_link_libraries(FLAC PRIVATE - $<TARGET_NAME_IF_EXISTS:Ogg::Ogg> - $<TARGET_NAME_IF_EXISTS:FLAC-asm> - $<TARGET_NAME_IF_EXISTS:win_utf8_io> - $<$<BOOL:${HAVE_LROUND}>:m>) +target_link_libraries(FLAC PRIVATE $<$<BOOL:${HAVE_LROUND}>:m>) +if(TARGET FLAC-asm) + target_link_libraries(FLAC PUBLIC FLAC-asm>) +endif() +if(TARGET win_utf8_io) + target_link_libraries(FLAC PUBLIC win_utf8_io>) +endif() +if(TARGET Ogg::Ogg) + target_link_libraries(FLAC PUBLIC Ogg::Ogg) +endif() set_target_properties(FLAC PROPERTIES C_VISIBILITY_PRESET hidden VERSION 8.3.0 diff --git a/src/share/getopt/CMakeLists.txt b/src/share/getopt/CMakeLists.txt index a247336c..1e5f5162 100644 --- a/src/share/getopt/CMakeLists.txt +++ b/src/share/getopt/CMakeLists.txt @@ -1,12 +1,4 @@ -cmake_minimum_required(VERSION 3.12) - check_include_file("libintl.h" HAVE_LIBINTL_H) check_include_file("string.h" HAVE_STRING_H) -add_compile_definitions( - $<$<BOOL:${HAVE_LIBINTL_H}>:HAVE_LIBINTL_H> - $<$<BOOL:${HAVE_STRING_H}>:HAVE_STRING_H>) - -add_library(getopt STATIC - getopt.c - getopt1.c) +add_library(getopt STATIC getopt.c getopt1.c) |