[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/kformula
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2009-06-16 20:54:12
Message-ID: 1245185652.538398.8906.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 982829 by rempt:

make kformula compile and link

 M  +2 -2      CMakeLists.txt  
 M  +3 -6      flake/CMakeLists.txt  


--- trunk/koffice/kformula/CMakeLists.txt #982828:982829
@@ -3,8 +3,7 @@
 set(KFORMULA_INCLUDES
     ${CMAKE_SOURCE_DIR}/kformula
     ${CMAKE_SOURCE_DIR}/kformula/flake
-    ${KOGUIUTILS_INCLUDES} 
-    ${KOTEXT_INCLUDES}
+    ${KOMAIN_INCLUDES}     
     )
 
 include_directories(${KFORMULA_INCLUDES})
@@ -29,6 +28,7 @@
 target_link_libraries(
     kformulaprivate
     kformulalib
+    komain
     ${KDE4_KDEUI_LIBS}
     ${KDE4_KPARTS_LIBS}
     ${KDE4_KDE3SUPPORT_LIBS}
--- trunk/koffice/kformula/flake/CMakeLists.txt #982828:982829
@@ -1,5 +1,5 @@
-include_directories(${QT_INCLUDES} ${KOGUIUTILS_INCLUDES} )
 remove_definitions(-DQT3_SUPPORT)
+include_directories(${QT_INCLUDES} ${KOMAIN_INCLUDES}  )
 
 ########### KFormula Library ###############
 
@@ -41,8 +41,8 @@
 
 kde4_add_library(kformulalib SHARED ${kformulalib_PART_SRCS})
 
-target_link_libraries(kformulalib ${KDE4_KDEUI_LIBS} koguiutils)
-target_link_libraries(kformulalib LINK_INTERFACE_LIBRARIES koguiutils)
+target_link_libraries(kformulalib komain ${KDE4_KDEUI_LIBS} )
+target_link_libraries(kformulalib LINK_INTERFACE_LIBRARIES komain)
 
 set_target_properties(kformulalib PROPERTIES VERSION ${GENERIC_KOFFICE_LIB_VERSION} \
SOVERSION ${GENERIC_KOFFICE_LIB_SOVERSION} )  
@@ -67,10 +67,7 @@
 
 target_link_libraries(
     formulashape
-    kostore
-    koguiutils
     kformulaprivate
-    flake
     kformulalib
     komain
     ${KDE4_KDEUI_LIBS}


[prev in list] [next in list] [prev in thread] [next in thread]