From: Kornel Benko <kornel@lyx.org>
Date: Wed, 30 Nov 2011 11:46:14 +0000 (+0000)
Subject: Backport cmake-build for using framework AppKit instead of Carbon on Apple
X-Git-Tag: 2.0.3~175
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=953d97afc01935e39bba71407842c490d4f1c86e;p=features.git

Backport cmake-build for using framework AppKit instead of Carbon on Apple

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40323 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt
index 6e5bc6fc3b..a25c2d3125 100644
--- a/development/cmake/src/CMakeLists.txt
+++ b/development/cmake/src/CMakeLists.txt
@@ -139,7 +139,7 @@ endif()
 
 if(APPLE)
 	target_link_libraries(${_lyx} "-bind_at_load")
-	target_link_libraries(${_lyx} "-framework Carbon")
+	target_link_libraries(${_lyx} "-framework AppKit")
 endif()
 
 if(MINGW)
diff --git a/development/cmake/src/client/CMakeLists.txt b/development/cmake/src/client/CMakeLists.txt
index ce1d9faa21..4f3a450fde 100644
--- a/development/cmake/src/client/CMakeLists.txt
+++ b/development/cmake/src/client/CMakeLists.txt
@@ -39,7 +39,7 @@ if(ASPELL_FOUND)
 endif()
 
 if(APPLE)
-	target_link_libraries(${_lyxclient} "-framework Carbon")
+	target_link_libraries(${_lyxclient} "-framework AppKit")
 endif()
 
 install(TARGETS ${_lyxclient} DESTINATION bin)
diff --git a/development/cmake/src/support/CMakeLists.txt b/development/cmake/src/support/CMakeLists.txt
index c9dce581c6..9d2eb6d137 100644
--- a/development/cmake/src/support/CMakeLists.txt
+++ b/development/cmake/src/support/CMakeLists.txt
@@ -75,7 +75,7 @@ target_link_libraries(support ${Lyx_Boost_Libraries} ${QT_QTCORE_LIBRARY} ${ZLIB
 lyx_add_gcc_pch(support)
 
 if(APPLE)
-	target_link_libraries(support "objc" "-framework Appkit" "-framework CoreFoundation")
+	target_link_libraries(support "objc" "-framework AppKit" "-framework CoreFoundation")
 elseif(WIN32)
 	target_link_libraries(support shlwapi psapi)
 endif()
diff --git a/development/cmake/src/tex2lyx/CMakeLists.txt b/development/cmake/src/tex2lyx/CMakeLists.txt
index 5e33cdfc63..141d1b1182 100644
--- a/development/cmake/src/tex2lyx/CMakeLists.txt
+++ b/development/cmake/src/tex2lyx/CMakeLists.txt
@@ -51,7 +51,7 @@ if(WIN32)
 endif()
 
 if(APPLE)
-	target_link_libraries(${_tex2lyx} "-framework Carbon")
+	target_link_libraries(${_tex2lyx} "-framework AppKit")
 endif()
 
 project_source_group("${GROUP_CODE}" tex2lyx_sources tex2lyx_headers)