Changeset 7312cfc in subsurface


Ignore:
Timestamp:
Jan 1, 2017, 10:31:47 AM (3 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
c39fbea
Parents:
ba23989
Message:

CMake: more changes to a simple conditional

It seems the CMake versions on Linux and Mac disagree about what might
be the correct way to use parenthesis in a mixed AND/OR conditional.
This may seem overkill, but it made both CMake versions happy.

Signed-off-by: Dirk Hohndel <dirk@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r3657cbe r7312cfc  
    7070if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
    7171        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 ")
    72         if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND
    73            (${CMAKE_SYSTEM_VERSION} MATCHES "11.4." OR ${CMAKE_OSX_DEPLOYMENT_TARGET} MATCHES "10.7" OR ${CMAKE_OSX_DEPLOYMENT_TARGET} MATCHES "10.8"))
     72        if((${CMAKE_SYSTEM_NAME} MATCHES "Darwin") AND
     73           ((${CMAKE_SYSTEM_VERSION} MATCHES "11.4.") OR
     74            (${CMAKE_OSX_DEPLOYMENT_TARGET} MATCHES "10.7") OR
     75            (${CMAKE_OSX_DEPLOYMENT_TARGET} MATCHES "10.8")))
    7476                set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
    7577        else()
Note: See TracChangeset for help on using the changeset viewer.