Page MenuHomePhorge
Files F120838904

No OneTemporary
Actions

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 79871e2..e51831b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,71 +1,72 @@
project (KolabUtilsFormat)
cmake_minimum_required(VERSION 2.6)
if(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 7)
cmake_policy(SET CMP0013 NEW)
endif()
option( USE_LIBCALENDARING "Use libcalendaring" FALSE )
set(CMAKE_MODULE_PATH ${KolabUtilsFormat_SOURCE_DIR}/cmake/modules)
set(BIN_INSTALL_DIR bin CACHE STRING "Where to install binaries to")
set(LIB_INSTALL_DIR lib CACHE STRING "Where to install libraries to")
find_package(Qt4 4.6.0 REQUIRED)
find_package(Libkolab 0.4.0 REQUIRED)
find_package(Libkolabxml 0.7 REQUIRED) #We should probably add the Libkolabxml_INCLUDES to Libkolab_INCLUDES if we have libkolabxml headers in the installed libkolab headers
if (USE_LIBCALENDARING)
find_package(Libcalendaring)
set( KDE_INCLUDES ${Libcalendaring_INCLUDE_DIRS} )
set( KDE_LIBRARIES ${Libcalendaring_LIBRARIES} )
message("${Libcalendaring_INCLUDE_DIRS} ${Libcalendaring_LIBRARIES}")
else()
find_package(KDE4 4.8 REQUIRED)
find_package(KdepimLibs 4.9.50 REQUIRED)
set( KDE_INCLUDES ${KDEPIMLIBS_INCLUDE_DIRS} ${KDE4_INCLUDE_DIR})
set( KDE_LIBRARIES
${KDE4_KDECORE_LIBRARY}
${KDEPIMLIBS_KCALCORE_LIBS}
${KDEPIMLIBS_KABC_LIBS}
${KDEPIMLIBS_KMIME_LIBS}
${KDEPIMLIBS_KIMAP_LIBS}
)
endif()
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-check-new -fno-common -Woverloaded-virtual -fno-threadsafe-statics -fvisibility=hidden -Werror=return-type -fvisibility-inlines-hidden -fexceptions -UQT_NO_EXCEPTIONS -g" )
+set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_DEBUG")
include_directories(./ lib ${QT_INCLUDES} ${KDE_INCLUDES} ${Libkolab_INCLUDES} ${Libkolabxml_INCLUDES})
set(COMMON_DEPENDENCIES
${Libkolab_LIBRARIES}
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
${QT_GUI_LIBRARY}
${KDE_LIBRARIES}
)
add_subdirectory(lib)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_subdirectory(fbdaemon)
add_subdirectory(migrationutility)
add_subdirectory(upgradetool)
########## Upgradetool
QT4_WRAP_CPP(SRC_MOC
upgradetool/imapupgradejob.h
upgradetool/kolabformatupgradejob.h
)
add_executable(kolab-formatupgrade ${UPGRADE_SRCS} ${SRC_MOC} ${JOBS_SRCS})
target_link_libraries(kolab-formatupgrade ${COMMON_DEPENDENCIES} kolabutils)
install(TARGETS kolab-formatupgrade
RUNTIME DESTINATION ${BIN_INSTALL_DIR}
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/autogen.sh b/autogen.sh
index 37e26ca..1b48767 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,76 +1,77 @@
#!/bin/bash
dobuild=0
doprep=0
dotest=0
doinstall=0
srcdir=$(pwd)
while [ $# -gt 0 ]; do
case "$1" in
--build|-b)
dobuild=1
shift
;;
--prep|-p)
doprep=1
shift
;;
--test|-t)
dotest=1
shift
;;
--install|-i)
doinstall=1
shift
;;
esac
done
if [ ${dobuild} -eq 0 -a ${doprep} -eq 0 -a ${dotest} -eq 0 -a ${doinstall} -eq 0 ]; then
dobuild=1
doprep=1
dotest=1
doinstall=1
fi
# Rebuilds the entire foo in one go. One shot, one kill.
rm -rf build/
mkdir -p build
cd build
if [ ${doprep} -eq 1 ]; then
cmake \
-DCMAKE_VERBOSE_MAKEFILE=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
-DINCLUDE_INSTALL_DIR=/usr/include \
-DLIB_INSTALL_DIR=/usr/lib64 \
-DBIN_INSTALL_DIR=/usr/bin \
-DUSE_LIBCALENDARING=ON \
+ -DCMAKE_BUILD_TYPE=Release \
..
fi
if [ ${dobuild} -eq 1 ]; then
make
fi
if [ ${dotest} -eq 1 ]; then
# Execute some tests?
echo ""
fi
if [ ${doinstall} -eq 1 ]; then
make install DESTDIR=${TMPDIR:-/tmp}
fi
cd ..
git archive --prefix=kolab-utils-3.0.5/ HEAD | gzip -c > kolab-utils-3.0.5.tar.gz
cp kolab-utils-3.0.5.tar.gz `rpm --eval='%{_sourcedir}'`

File Metadata

Mime Type
text/x-diff
Expires
Fri, Apr 24, 2:05 PM (1 w, 1 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18829048
Default Alt Text
(4 KB)

Event Timeline