From e86f450b4f064d4d882d396162e03b1140d3507e Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sun, 26 Jul 2015 15:32:36 +0000 Subject: [PATCH] generic: misc cleanup --- kdevelop/CMakeLists.txt | 3 +++ kdevplatform/plugins/classbrowser/CMakeLists.txt | 8 +------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/kdevelop/CMakeLists.txt b/kdevelop/CMakeLists.txt index 75e4c0ba..99a4cab2 100644 --- a/kdevelop/CMakeLists.txt +++ b/kdevelop/CMakeLists.txt @@ -37,6 +37,9 @@ if("${_isSystemLibDir}" STREQUAL "-1") endif("${_isSystemLibDir}" STREQUAL "-1") set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) +# find_package(KDevPlatform COMPONENTS INTERFACES REQUIRED) +include(ExternalProject) +ExternalProject_Add(KDevPlatform SOURCE_DIR "${CMAKE_SOURCE_DIR}/kdevplatform") include_directories(${KDEVPLATFORM_INCLUDE_DIR}) diff --git a/kdevplatform/plugins/classbrowser/CMakeLists.txt b/kdevplatform/plugins/classbrowser/CMakeLists.txt index 25542c09..0f78b414 100644 --- a/kdevplatform/plugins/classbrowser/CMakeLists.txt +++ b/kdevplatform/plugins/classbrowser/CMakeLists.txt @@ -1,16 +1,10 @@ include_directories( + ${CMAKE_SOURCE_DIR}/miniboost ${CMAKE_CURRENT_BINARY_DIR} ${KDevPlatform_SOURCE_DIR} - ${Boost_INCLUDE_DIRS} ) -# workaround a boost bug in 1.37 and 1.38 that causes link failure when exceptions are disabled -# see https://svn.boost.org/trac/boost/ticket/2947 for details -if( ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_PATCH_VERSION} VERSION_GREATER 1.36.1 ) - add_definitions( ${KDE4_ENABLE_EXCEPTIONS} ) -endif( ${Boost_MAJOR_VERSION}.${Boost_MINOR_VERSION}.${Boost_PATCH_VERSION} VERSION_GREATER 1.36.1 ) - add_definitions( -DKDE_DEFAULT_DEBUG_AREA=9512 ) ########### next target ###############