Commit 6ba809fb authored by Ralf Habacker's avatar Ralf Habacker
Browse files

Merge remote-tracking branch 'origin/Applications/17.04'

parents 96ad2a5e 46763682
......@@ -162,6 +162,7 @@ else()
Completion
Config
CoreAddons
Crash
DocTools
I18n
IconThemes
......
......@@ -580,7 +580,11 @@ else()
${CMAKE_CURRENT_SOURCE_DIR}/pics/global/128-apps-umbrello.png
)
add_executable(umbrello ${umbrello_SRCS})
target_link_libraries(umbrello libumbrello KF5::WindowSystem)
target_link_libraries(umbrello
libumbrello
KF5::Crash
KF5::WindowSystem
)
set_target_properties(umbrello PROPERTIES OUTPUT_NAME umbrello5)
endif()
if(LIB_BUILD_MODE EQUAL SHARED)
......
......@@ -28,6 +28,7 @@
#include <ktip.h>
#if QT_VERSION >= 0x050000
#include <KCrash>
#include <QApplication>
#include <QCommandLineParser>
#endif
......@@ -102,6 +103,7 @@ int main(int argc, char *argv[])
{
#if QT_VERSION >= 0x050000
QApplication app(argc, argv);
KCrash::initialize();
KLocalizedString::setApplicationDomain("umbrello");
......
......@@ -120,7 +120,7 @@ target_link_libraries(testcrashhandler ${LIBS})
find_package(LLVM CONFIG)
find_package(CLANG QUIET)
if(LLVM_FOUND)
if(LLVM_FOUND AND CLANG_FOUND)
message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
......@@ -129,10 +129,8 @@ if(LLVM_FOUND)
include_directories(${LLVM_INCLUDE_DIRS})
add_definitions(${LLVM_DEFINITIONS})
if(CLANG_FOUND)
include_directories(${CLANG_INCLUDE_DIRS})
add_definitions(${CLANG_DEFINITIONS})
endif()
include_directories(${CLANG_INCLUDE_DIRS})
add_definitions(${CLANG_DEFINITIONS})
# Now build our tools
add_executable(testllvm testllvm.cpp)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment