cmake: set -std=c+++11 with target_compile_features instead

This commit is contained in:
Henrik Grimler 2021-12-07 19:54:02 +01:00
parent 719edaff9e
commit 761c2db4d2
No known key found for this signature in database
GPG Key ID: B0076E490B71616B
3 changed files with 5 additions and 12 deletions

View File

@ -12,12 +12,8 @@ find_package(Qt5Widgets REQUIRED)
find_package(ZLIB REQUIRED)
if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lobjc -framework IOKit -framework CoreFoundation")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
endif()
if(MINGW)
@ -48,6 +44,8 @@ add_executable(heimdall-frontend WIN32
${HEIMDALL_FRONTEND_FORMS}
${HEIMDALL_FRONTEND_RESOURCES})
target_compile_features(heimdall-frontend PRIVATE cxx_std_11)
include(LargeFiles)
use_large_files(heimdall-frontend YES)

View File

@ -8,12 +8,8 @@ set(LIBPIT_INCLUDE_DIRS
../libpit/source)
if(APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")
set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lobjc -framework IOKit -framework CoreFoundation")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11 -D_FILE_OFFSET_BITS=64")
endif()
if(MINGW)
@ -46,6 +42,7 @@ set(HEIMDALL_SOURCE_FILES
include(LargeFiles)
use_large_files(heimdall YES)
add_executable(heimdall ${HEIMDALL_SOURCE_FILES})
target_compile_features(heimdall PRIVATE cxx_std_11)
target_link_libraries(heimdall PRIVATE pit)
target_link_libraries(heimdall PRIVATE ${LIBUSB_LIBRARIES})

View File

@ -1,11 +1,9 @@
cmake_minimum_required(VERSION 3.0.0)
project(libpit)
if(NOT APPLE)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
endif()
set(LIBPIT_SOURCE_FILES
source/libpit.cpp)
add_library(pit STATIC ${LIBPIT_SOURCE_FILES})
target_compile_features(pit PRIVATE cxx_std_11)