[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: koffice
From: Mike Arthur <mike () mikearthur ! co ! uk>
Date: 2010-03-19 10:09:53
Message-ID: 20100319100953.2555FAC852 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1105143 by mikearthur:
Various build fixes for Qt with Cocoa on Mac.
This also includes fixing r1104777 and making it specific to using
Cocoa rather than just affecting Apple.
M +1 -1 CMakeLists.txt
M +2 -2 filters/CMakeLists.txt
M +2 -2 filters/kspread/CMakeLists.txt
M +2 -2 filters/kword/CMakeLists.txt
M +6 -1 kpresenter/plugins/eventactions/CMakeLists.txt
--- trunk/koffice/CMakeLists.txt #1105142:1105143
@@ -291,12 +291,12 @@
${CMAKE_SOURCE_DIR}/libs/kotext/changetracker
${CMAKE_SOURCE_DIR}/libs/kotext/styles
${CMAKE_SOURCE_DIR}/libs/kotext/opendocument
+ ${SOPRANO_INCLUDE_DIR}
${FLAKE_INCLUDES}
${KOODF_INCLUDES})
# komain depends on kotext & flake
set(KOMAIN_INCLUDES ${KDE4_INCLUDES}
- ${SOPRANO_INCLUDE_DIR}
${KOTEXT_INCLUDES}
${CMAKE_SOURCE_DIR}/libs/widgets
${CMAKE_SOURCE_DIR}/libs/main
--- trunk/koffice/filters/CMakeLists.txt #1105142:1105143
@@ -72,8 +72,8 @@
macro_optional_add_subdirectory(kplato)
endif(SHOULD_BUILD_KPLATO)
-if(NOT TINY AND LIBXML2_FOUND AND LIBXSLT_FOUND AND NOT WIN32 AND NOT APPLE)
+if(NOT TINY AND LIBXML2_FOUND AND LIBXSLT_FOUND AND NOT WIN32 AND NOT \
QT_MAC_USE_COCOA) add_subdirectory(xsltfilter)
-endif(NOT TINY AND LIBXML2_FOUND AND LIBXSLT_FOUND AND NOT WIN32 AND NOT APPLE)
+endif(NOT TINY AND LIBXML2_FOUND AND LIBXSLT_FOUND AND NOT WIN32 AND NOT \
QT_MAC_USE_COCOA)
########### install files ###############
--- trunk/koffice/filters/kspread/CMakeLists.txt #1105142:1105143
@@ -11,8 +11,8 @@
add_subdirectory( excel )
add_subdirectory( xlsx )
-if(NOT WIN32)
+if(NOT WIN32 AND NOT QT_MAC_USE_COCOA)
add_subdirectory( html )
add_subdirectory( latex )
-endif(NOT WIN32)
+endif(NOT WIN32 AND NOT QT_MAC_USE_COCOA)
--- trunk/koffice/filters/kword/CMakeLists.txt #1105142:1105143
@@ -69,7 +69,7 @@
add_subdirectory( docbook )
#html FIXME: export dialog is Qt 3 version ui file
- if(NOT WIN32 AND NOT APPLE)
+ if(NOT WIN32 AND NOT QT_MAC_USE_COCOA)
add_subdirectory( html )
# if (TARGET kowmf)
# add_subdirectory( mswrite )
@@ -78,7 +78,7 @@
add_subdirectory( hancomword )
message(STATUS "When latex is reactivated (if?) also port it to \
GraphicsMagick, to make life easy for Isaac.") #add_subdirectory( latex )
- endif(NOT WIN32 AND NOT APPLE)
+ endif(NOT WIN32 AND NOT QT_MAC_USE_COCOA)
add_subdirectory( oowriter )
add_subdirectory( palmdoc )
--- trunk/koffice/kpresenter/plugins/eventactions/CMakeLists.txt #1105142:1105143
@@ -1,4 +1,9 @@
-include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES} \
${CMAKE_SOURCE_DIR}/kpresenter/part ${PHONON_INCLUDE_DIR}/phonon) \
+include_directories( ${KOMAIN_INCLUDES} ${FLAKE_INCLUDES} \
${CMAKE_SOURCE_DIR}/kpresenter/part) +if(NOT QT_MAC_USE_COCOA)
+ include_directories(${PHONON_INCLUDE_DIR}/phonon)
+else(NOT QT_MAC_USE_COCOA)
+ include_directories(${PHONON_INCLUDE_DIR})
+endif(NOT QT_MAC_USE_COCOA)
set(kpresentereventactions_PART_SRCS
sound/KPrSoundEventAction.cpp
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic