generic: misc cleanup

This commit is contained in:
Ivailo Monev 2015-07-26 15:32:36 +00:00
parent 32c16aadd5
commit e86f450b4f
2 changed files with 4 additions and 7 deletions

View file

@ -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})

View file

@ -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 ###############