Re: Re: [BRANCH] fix linking with autotools on mac

[Kornel Benko]

Am Dienstag, 29. November 2011 um 10:17:37, schrieb Richard Heck 
<rgh...@comcast.net>
> On 11/29/2011 10:10 AM, Jean-Marc Lasgouttes wrote:
> > Richard,
> >
> > The following patch has not been baclported to branch (r39772+r39791).
> >
> > OK?
> >
> Sure. Did you see the message about CMake, as well? Does this cover that?
> 
> Richard
> 
This would be the attached.

        Kornel
Index: development/cmake/src/client/CMakeLists.txt
===================================================================
--- development/cmake/src/client/CMakeLists.txt	(Revision 40300)
+++ development/cmake/src/client/CMakeLists.txt	(Arbeitskopie)
@@ -39,7 +39,7 @@
 endif()
 
 if(APPLE)
-	target_link_libraries(${_lyxclient} "-framework Carbon")
+	target_link_libraries(${_lyxclient} "-framework AppKit")
 endif()
 
 install(TARGETS ${_lyxclient} DESTINATION bin)
Index: development/cmake/src/CMakeLists.txt
===================================================================
--- development/cmake/src/CMakeLists.txt	(Revision 40300)
+++ development/cmake/src/CMakeLists.txt	(Arbeitskopie)
@@ -139,7 +139,7 @@
 
 if(APPLE)
 	target_link_libraries(${_lyx} "-bind_at_load")
-	target_link_libraries(${_lyx} "-framework Carbon")
+	target_link_libraries(${_lyx} "-framework AppKit")
 endif()
 
 if(MINGW)
Index: development/cmake/src/support/CMakeLists.txt
===================================================================
--- development/cmake/src/support/CMakeLists.txt	(Revision 40300)
+++ development/cmake/src/support/CMakeLists.txt	(Arbeitskopie)
@@ -75,7 +75,7 @@
 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()
Index: development/cmake/src/tex2lyx/CMakeLists.txt
===================================================================
--- development/cmake/src/tex2lyx/CMakeLists.txt	(Revision 40300)
+++ development/cmake/src/tex2lyx/CMakeLists.txt	(Arbeitskopie)
@@ -51,7 +51,7 @@
 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)

signature.asc
Description: This is a digitally signed message part.