From 8759819b1b1fbb764e7f4045dfa5ef9fef8fee28 Mon Sep 17 00:00:00 2001 From: fduncanh Date: Sun, 27 Feb 2022 14:08:16 -0500 Subject: [PATCH] CMakefile.txt rearrangement --- lib/CMakeLists.txt | 10 ++++++++++ renderers/CMakeLists.txt | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 77a1465..767ce71 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -1,6 +1,16 @@ cmake_minimum_required(VERSION 3.4.1) include_directories( playfair llhttp ) +# Common Linux cflags +if ( UNIX AND NOT APPLE ) + set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSTANDALONE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -U_FORTIFY_SOURCE -Wall -g" ) +endif() + +# Common x86/x86_64 cflags +if( CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)" ) + set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Ofast -march=native" ) +endif() + INCLUDE (CheckIncludeFiles) # for BSD Unix (e.g. FreeBSD) CHECK_INCLUDE_FILES ("sys/endian.h" BSD ) diff --git a/renderers/CMakeLists.txt b/renderers/CMakeLists.txt index 450840b..62ed3d5 100644 --- a/renderers/CMakeLists.txt +++ b/renderers/CMakeLists.txt @@ -1,15 +1,5 @@ cmake_minimum_required(VERSION 3.4.1) -# Common Linux cflags -if ( UNIX AND NOT APPLE ) - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DSTANDALONE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -D_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -U_FORTIFY_SOURCE -Wall -g" ) -endif() - -# Common x86/x86_64 cflags -if( CMAKE_SYSTEM_PROCESSOR MATCHES "(x86)|(X86)|(amd64)|(AMD64)" ) - set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Ofast -march=native" ) -endif() - if (APPLE ) set( ENV{PKG_CONFIG_PATH} "/Library/FrameWorks/GStreamer.framework/Libraries/pkgconfig" ) # GStreamer.framework, preferred set( ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:/usr/local/lib/pkgconfig" ) # standard location, and Brew