diff options
| author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2012-06-26 11:00:21 (GMT) |
|---|---|---|
| committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2012-06-26 11:00:21 (GMT) |
| commit | 4744a3b71c936ca714cf417b51881174f565ab62 (patch) | |
| tree | 8497b4e1ca6a2f42c87cfb1cd3f2192ddcd68a28 /kdecore | |
| parent | fce7890292ba8ffb868db104ecc49e7e91b7cddd (diff) | |
| download | libcalendaring-4744a3b71c936ca714cf417b51881174f565ab62.tar.gz | |
make kcalcore build
Diffstat (limited to 'kdecore')
| -rw-r--r-- | kdecore/CMakeLists.txt | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/kdecore/CMakeLists.txt b/kdecore/CMakeLists.txt index 44a2ab1..a8b21fc 100644 --- a/kdecore/CMakeLists.txt +++ b/kdecore/CMakeLists.txt @@ -2,7 +2,7 @@ project(kdecore) -set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") +set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") cmake_minimum_required(VERSION 2.6) # only available from cmake-2.8.0 @@ -18,7 +18,7 @@ endif() -find_package(Qt4 4.7.0 REQUIRED) +find_package(Qt4 4.6.0 REQUIRED) include_directories(${QT_INCLUDES}) @@ -222,9 +222,9 @@ set(kdecore_LIB_SRCS # compression/kgzipfilter.cpp # compression/kfilterbase.cpp # compression/kfilterdev.cpp -# config/kconfig.cpp -# config/kconfigbase.cpp -# config/kconfiggroup.cpp + config/kconfig.cpp + config/kconfigbase.cpp + config/kconfiggroup.cpp # config/kconfigbackend.cpp # config/kconfigini.cpp # config/kdesktopfile.cpp @@ -348,7 +348,7 @@ set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS} # network/ktcpsocket.cpp # localization/kcatalog.cpp # localization/kcurrencycode.cpp -# localization/kcharsets.cpp + localization/kcharsets.cpp # localization/kencodingdetector.cpp # localization/guess_ja.cpp # localization/kencodingprober.cpp @@ -432,9 +432,9 @@ set(kdecore_LIB_SRCS ${kdecore_LIB_SRCS} # add_definitions(-DNO_DISPLAY) # endif (NOT Q_WS_X11 AND NOT Q_WS_QWS) -add_library(kdecore ${LIBRARY_TYPE} ${kdecore_LIB_SRCS}) +add_library(calendaring-kdecore ${LIBRARY_TYPE} ${kdecore_LIB_SRCS}) -target_link_libraries(kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARY} ${kdecore_OPTIONAL_LIBS}) +target_link_libraries(calendaring-kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARY} ${kdecore_OPTIONAL_LIBS}) # if(WINCE) # target_link_libraries(kdecore ${WCECOMPAT_LIBRARIES} Ceshell.lib) @@ -462,9 +462,9 @@ target_link_libraries(kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_ # endif(APPLE) # endif(WIN32) -target_link_libraries(kdecore LINK_INTERFACE_LIBRARIES ${kdecore_LINK_INTERFACE_LIBRARIES} ) +target_link_libraries(calendaring-kdecore LINK_INTERFACE_LIBRARIES ${kdecore_LINK_INTERFACE_LIBRARIES} ) -set_target_properties(kdecore PROPERTIES +set_target_properties(calendaring-kdecore PROPERTIES VERSION ${KDE_NON_GENERIC_LIB_VERSION} SOVERSION ${KDE_NON_GENERIC_LIB_SOVERSION} ) |