casa-mp-base
Public
Commits
Ken Cunningham authored and Ken committed b59a4ccdb05
| 1 1 | --- CMakeLists.txt.orig 2017-12-15 23:52:23.000000000 -0800 |
| 2 2 | +++ CMakeLists.txt 2017-12-16 00:00:29.000000000 -0800 |
| 3 3 | |
| 4 4 | #============================================================================ |
| 5 5 | |
| 6 6 | cmake_minimum_required(VERSION 2.8.9) |
| 7 7 | -set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "Minimum OS X deployment version") |
| 8 8 | +set(CMAKE_OSX_DEPLOYMENT_TARGET "10.6" CACHE STRING "Minimum OS X deployment version") |
| 9 9 | |
| 10 10 | # For checks in subdirectories |
| 11 11 | set(InOpenJK TRUE) |
| 12 - | |
| 13 - | # We don't try to control symbol visibility under MSVC. |
| 14 - | set(OPENJK_VISIBILITY_FLAGS "") |
| 15 - | |
| 16 - | -elseif (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")) |
| 17 - | +elseif (("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") OR ("${CMAKE_C_COMPILER_ID}" MATCHES "Clang")) |
| 18 - | # I hope this doesn't come back to bite me in the butt later on. |
| 19 - | # Realistically though, can the C and CXX compilers be different? |
| 20 - | |
| 21 - | |
| 22 - | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libgcc") |
| 23 - | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static-libstdc++") |
| 24 - | endif() |
| 25 - | - elseif("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") |
| 26 - | + elseif("${CMAKE_C_COMPILER_ID}" MATCHES "Clang") |
| 27 - | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall") |
| 28 - | set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-comment") |
| 29 - | endif() |
| 30 - | |
| 31 - | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mstackrealign") |
| 32 - | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpmath=sse") |
| 33 - | endif() |
| 34 - | - elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") |
| 35 - | + elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") |
| 36 - | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") |
| 37 - | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-write-strings") |
| 38 - | #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-writable-strings") |