aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Montel <montel@kde.org>2008-09-21 07:55:46 +0000
committerLaurent Montel <montel@kde.org>2008-09-21 07:55:46 +0000
commitc2aa18186d3265e97e9910ac09ed5c5a376efbe2 (patch)
tree042b283d0ff133c089d7ee2605975bc7e1acd453
parent5bab527e929f2dc1f84ec9f606e8040a4d553497 (diff)
downloadextra-cmake-modules-c2aa18186d3265e97e9910ac09ed5c5a376efbe2.tar.gz
extra-cmake-modules-c2aa18186d3265e97e9910ac09ed5c5a376efbe2.tar.bz2
Add cmake macro for kformula lib
svn path=/trunk/KDE/kdelibs/; revision=863122
-rw-r--r--modules/FindKDE4Internal.cmake8
1 files changed, 7 insertions, 1 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake
index 3b3952ba..e40a4efa 100644
--- a/modules/FindKDE4Internal.cmake
+++ b/modules/FindKDE4Internal.cmake
@@ -43,6 +43,7 @@
# KDE4_KTEXTEDITOR_LIBRARY - the ktexteditor library
# KDE4_KNEPOMUK_LIBRARY - the knepomuk library
# KDE4_KMETADATA_LIBRARY - the kmetadata library
+# KDE4_KFORMULA_LIBRARY - the kformula library
#
# Compared to the variables above, the following variables
# also contain all of the depending libraries, so the variables below
@@ -71,6 +72,7 @@
# KDE4_KTEXTEDITOR_LIBS - the ktexteditor library and all depending libraries
# KDE4_KNEPOMUK_LIBS - the knepomuk library and all depending libraries
# KDE4_KMETADATA_LIBS - the kmetadata library and all depending libraries
+# KDE4_KFORMULA_LIBS - the kformula library and all depending librairies
#
# This module defines a bunch of variables used as locations for install directories.
# They can be relative (to CMAKE_INSTALL_PREFIX) or absolute.
@@ -520,6 +522,10 @@ else (_kdeBootStrapping)
#find_library(KDE4_KMETADATA_LIBRARY NAMES kmetadata PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
#set(KDE4_KMETADATA_LIBS ${kmetadata_LIB_DEPENDS} ${KDE4_KMETADATA_LIBRARY} )
+ find_library(KDE4_KFORMULA_LIBRARY NAMES kformula PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH )
+ set(KDE4_KFORMULA_LIBS ${kformula_LIB_DEPENDS} ${KDE4_KFORMULA_LIBRARY} )
+
+
get_filename_component(KDE4_LIB_DIR ${KDE4_KDECORE_LIBRARY} PATH )
# kpassworddialog.h is new with KDE4
@@ -1035,7 +1041,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
if (CMAKE_SYSTEM_NAME MATCHES Linux)
set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -fno-check-new -fno-common")
+ set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -fno-check-new -fno-common -pedantic")
add_definitions (-D_BSD_SOURCE)
endif (CMAKE_SYSTEM_NAME MATCHES Linux)