mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2024-12-29 09:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restore CMake configuration to use -stdlib=libc++ even on OS X 10.7

Browse Source
This commit is contained in:
David Capello 2018-08-06 16:42:55 -03:00
parent 56d85a2dc8
commit d13806ac23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -7,6 +7,7 @@ cmake_minimum_required(VERSION 3.4)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) # We use -std=c++11 instead of -std=gnu++11 in macOS
if(COMMAND cmake_policy) if(COMMAND cmake_policy)
# CMP0003: Libraries linked via full path no longer produce linker search paths. # CMP0003: Libraries linked via full path no longer produce linker search paths.
@ -34,6 +35,12 @@ set(CMAKE_USER_MAKE_RULES_OVERRIDE_CXX ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cxx_fla
# Aseprite project # Aseprite project
project(aseprite C CXX) project(aseprite C CXX)
if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
# As we compile with CMAKE_OSX_DEPLOYMENT_TARGET=10.7, we have to
# explicitly say that we want to use libc++ instead of the GNU libstdc++
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
endif()
# Check repository status # Check repository status
if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/laf/CMakeLists.txt) if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/laf/CMakeLists.txt)
message(FATAL_ERROR "Your Aseprite repository is incomplete, initialize submodules using:\n git submodule update --init --recursive") message(FATAL_ERROR "Your Aseprite repository is incomplete, initialize submodules using:\n git submodule update --init --recursive")

2
src/clip

@ -1 +1 @@
Subproject commit 39c1a6aa3b13463fa6964fd4310caeace7da305e Subproject commit 00b325af165b0a0b84acf64e3a8b4b61effe5be8

2
third_party/fmt vendored

@ -1 +1 @@
Subproject commit 933a33a7948c3d9bb984473b9b92832f52c590cd Subproject commit 4061a0d35dbf788cc7b1f312a97e4e48618f916e