From 77d7e6a764011a3b6dc13afbf7b26be39cb56dbd Mon Sep 17 00:00:00 2001 From: Aqua-sama Date: Sun, 14 Oct 2018 11:33:32 +0200 Subject: Update CMakeLists option names --- src/CMakeLists.txt | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'src/CMakeLists.txt') diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b772792..9425b2d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -58,9 +58,9 @@ set(srclist ) # if you are using a custom build location for breakpad: -#if(Breakpad) +#if(Feature_Breakpad) # link_directories("${BREAKPAD_LIBRARY_DIRS}") -#endif() +#endif(Feature_Breakpad) if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") add_executable(${poi_exe} WIN32 ${srclist} ${PROJECT_SOURCE_DIR}/data/windows.rc) @@ -69,14 +69,14 @@ else() endif() target_include_directories(${poi_exe} - PRIVATE ${Boost_INCLUDE_DIRS} + PRIVATE ${Boost_INCLUDE_DIRS} PRIVATE ${PROJECT_SOURCE_DIR}/include - PRIVATE ${PROJECT_SOURCE_DIR}/lib - PRIVATE ${PROJECT_SOURCE_DIR}/plugins + PRIVATE ${PROJECT_SOURCE_DIR}/lib + PRIVATE ${PROJECT_SOURCE_DIR}/plugins ) target_link_libraries(${poi_exe} - Qt5::Core Qt5::Widgets Qt5::Concurrent Qt5::WebEngineWidgets + Qt5::Core Qt5::Widgets Qt5::WebEngineWidgets ${Boost_LIBRARIES} SingleApplication about @@ -85,20 +85,18 @@ target_link_libraries(${poi_exe} bookmarks downloads web urlfilter ) -if(Breakpad) - find_package(Threads REQUIRED) - +if(Feature_Breakpad) target_link_libraries(${poi_exe} Threads::Threads ${BREAKPAD_LIBRARIES}) target_include_directories(${poi_exe} PRIVATE ${BREAKPAD_INCLUDE_DIRS}) target_compile_options(${poi_exe} PRIVATE ${BREAKPAD_CFLAGS_OTHER}) target_compile_definitions(${poi_exe} PRIVATE BreakpadEnabled) -endif() +endif(Feature_Breakpad) -if(Plasma) +if(Feature_Plasma) target_link_libraries(${poi_exe} KF5::Wallet KF5::WindowSystem) target_compile_definitions(${poi_exe} PRIVATE PLASMA) -endif(Plasma) +endif(Feature_Plasma) target_compile_definitions(${poi_exe} PRIVATE QAPPLICATION_CLASS=QApplication -- cgit v1.2.1