aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2018-09-28 14:12:46 +0200
committerAqua-sama <aqua@iserlohn-fortress.net>2018-09-28 14:12:46 +0200
commit4ea2417101ff930495e07c0afdb34cbae533fee7 (patch)
tree6440db9713a75723b6c17bf22198e6996b1cfdba
parentbreakpad: keep all build artifacts (diff)
downloadsmolbote-4ea2417101ff930495e07c0afdb34cbae533fee7.tar.xz
breakpad: Use system breakpad by default
-rw-r--r--3rd-party/breakpad/CMakeLists.txt12
-rw-r--r--linux/makepkg/PKGBUILD5
-rw-r--r--src/CMakeLists.txt7
3 files changed, 16 insertions, 8 deletions
diff --git a/3rd-party/breakpad/CMakeLists.txt b/3rd-party/breakpad/CMakeLists.txt
index dd0ef8e..56e30dc 100644
--- a/3rd-party/breakpad/CMakeLists.txt
+++ b/3rd-party/breakpad/CMakeLists.txt
@@ -1,11 +1,13 @@
if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
- if (NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/install")
- message(FATAL_ERROR "Could not find breakpad build, see 3rd-party/breakpad/build.sh")
- endif ()
-
find_package(PkgConfig REQUIRED)
- set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CMAKE_CURRENT_LIST_DIR}/install/lib/pkgconfig" )
+
+ # if you do not have breakpad installed, use the build.sh script and uncomment this
+# if (NOT EXISTS "${CMAKE_CURRENT_LIST_DIR}/install")
+# message(FATAL_ERROR "Could not find breakpad build, see 3rd-party/breakpad/build.sh")
+# endif ()
+# set(ENV{PKG_CONFIG_PATH} "$ENV{PKG_CONFIG_PATH}:${CMAKE_CURRENT_LIST_DIR}/install/lib/pkgconfig" )
+
pkg_check_modules(BREAKPAD REQUIRED IMPORTED_TARGET breakpad-client)
endif() # linux system \ No newline at end of file
diff --git a/linux/makepkg/PKGBUILD b/linux/makepkg/PKGBUILD
index e6973dd..2a5c957 100644
--- a/linux/makepkg/PKGBUILD
+++ b/linux/makepkg/PKGBUILD
@@ -47,6 +47,10 @@ build() {
# -DUseLibCpp Off
# -DTests Off
# -DPlasma Off
+ # -DBreakpad Off If you turn it on, add a breakpad
+ # dependancy to makedepends, or modify
+ # 3rd-pary/breakpad/CMakeLists.txt
+ # accordingly.
cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=$pkgdir/usr/local \
@@ -54,6 +58,7 @@ build() {
-DVerDescribe=$_describe \
-DVerCommit=$_commit \
-DVerBranch=$_branch \
+ -DBreakpad=On \
$srcdir/smolbote
# Build
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e256ee8..3263bbb 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -47,9 +47,10 @@ set(srclist
plugin.h
)
-if(Breakpad)
- link_directories("${BREAKPAD_LIBRARY_DIRS}")
-endif()
+# if you are using a custom build location for breakpad:
+#if(Breakpad)
+# link_directories("${BREAKPAD_LIBRARY_DIRS}")
+#endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
add_executable(${poi_exe} WIN32 ${srclist} ${PROJECT_SOURCE_DIR}/data/windows.rc)