From 5b2439e7c993dd65969275836074fd20faf1bd1e Mon Sep 17 00:00:00 2001 From: John Ralls Date: Wed, 6 Sep 2017 22:24:19 -0700 Subject: [PATCH] Set -xobjective-c or -xobjective-c++ for Mac code depending compiler. Also require at least Cmake-3.3 for Apple as that's the minimum that supports the COMPILE_LANGUAGE generator expression. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 61071cfefa..d94e003589 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ # CMakeLists.txt for GnuCash -IF (WIN32) +IF (WIN32 OR APPLE) CMAKE_MINIMUM_REQUIRED (VERSION 3.3.2) ELSE() CMAKE_MINIMUM_REQUIRED (VERSION 3.0) @@ -349,7 +349,7 @@ IF(APPLE) FIND_LIBRARY(COCOA_LIBRARY Cocoa) FIND_LIBRARY(SECURITY_LIBRARY Security) FIND_LIBRARY(CARBON_LIBRARY Carbon) - SET(OSX_EXTRA_COMPILE_FLAGS -xobjective-c) + SET(OSX_EXTRA_COMPILE_FLAGS $<$:-xobjective-c> $<$:-xobjective-c++>) SET(OSX_EXTRA_LIBRARIES objc ${COCOA_LIBRARY} ${SECURITY_LIBRARY} ${CARBON_LIBRARY}) ENDIF(GTK_MAC_FOUND) ENDIF()