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 6e5bc6fc3b9652e533abb4a8452a682dfec31e1e..a25c2d3125d14eee99e453858c6e2b0efa059456 100644 (file)
--- 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 ce1d9faa21d7cafb779cabc6e1f10c4cdcd62145..4f3a450fdec8cb55d17a2e98bacdbed6bc9d8c9a 100644 (file)
--- 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 c9dce581c6c1402231f89ddd42fc9a3a1d4fbe58..9d2eb6d137e5d73ad5765a6afa69e1eb2cfd3e72 100644 (file)
--- 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 5e33cdfc634a54aa4f34fb148a45c6420dcf78bb..141d1b1182feffe621f732fbd19f44d79986e685 100644 (file)
--- 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)