diff options
| -rw-r--r-- | ConfigureChecks.cmake | 2 | ||||
| -rw-r--r-- | indexlib/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | libtdepim/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libtdepim/ConfigureChecks.cmake | 12 |
4 files changed, 1 insertions, 18 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 67500f42..21423943 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -35,7 +35,6 @@ if( BUILD_INDEXLIB OR BUILD_KMAIL ) # check for stl coping with namespace std tde_save( CMAKE_CXX_FLAGS ) - string( REGEX REPLACE "-include tqt.h" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" ) check_cxx_source_compiles(" #include <iterator> struct s : public std::iterator<std::forward_iterator_tag, int> {}; @@ -149,7 +148,6 @@ if( (BUILD_LIBTDENETWORK OR BUILD_CERTMANAGER OR BUILD_KMAIL OR BUILD_KADDRESSBO tde_save( CMAKE_CXX_FLAGS ) tde_save( CMAKE_REQUIRED_INCLUDES ) tde_save( CMAKE_REQUIRED_LIBRARIES ) - string( REGEX REPLACE "-include tqt.h" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${LARGEFILES_DEFINITIONS}") set( CMAKE_REQUIRED_INCLUDES "${GPGME_INCLUDE_DIRS}") set( CMAKE_REQUIRED_LIBRARIES "${GPGME_LIBRARIES}") diff --git a/indexlib/CMakeLists.txt b/indexlib/CMakeLists.txt index f89e4f1a..6f5a42e5 100644 --- a/indexlib/CMakeLists.txt +++ b/indexlib/CMakeLists.txt @@ -13,7 +13,6 @@ project( indexlib ) include( ConfigureChecks.cmake ) -string( REPLACE "-include tqt.h" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -include compat.h ${USE_EXCEPTIONS}" ) include_directories( diff --git a/libtdepim/CMakeLists.txt b/libtdepim/CMakeLists.txt index f96611f3..c604626c 100644 --- a/libtdepim/CMakeLists.txt +++ b/libtdepim/CMakeLists.txt @@ -11,8 +11,6 @@ project( libtdepim ) -include( ConfigureChecks.cmake ) - tde_import( libkmime ) tde_import( libkcal ) tde_import( ktnef ) @@ -96,7 +94,7 @@ tde_add_library( tdepim SHARED AUTOMOC csshelper.cpp distributionlist.cpp kpimurlrequesterdlg.cpp sendsmsdialog.cpp kmailcompletion.cpp VERSION 1.0.0 - LINK kcal-shared tdeimproxy-shared tdeparts-shared ${TQTQUI_LIBRARIES} + LINK kcal-shared tdeimproxy-shared tdeparts-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/libtdepim/ConfigureChecks.cmake b/libtdepim/ConfigureChecks.cmake deleted file mode 100644 index b91f0f8f..00000000 --- a/libtdepim/ConfigureChecks.cmake +++ /dev/null @@ -1,12 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -find_package( TQtQUI ) |