From 53eb0e95ab13dab5ddc29991f0e0985ab4bad73d Mon Sep 17 00:00:00 2001 From: Troy James Sobotka Date: Mon, 13 May 2019 16:55:42 -0700 Subject: [PATCH 1/3] Fix for #952 Should fix missing declaration from signal as per issue #952. --- global/crashhandler.h | 1 + 1 file changed, 1 insertion(+) diff --git a/global/crashhandler.h b/global/crashhandler.h index da11558bd..d1de95267 100644 --- a/global/crashhandler.h +++ b/global/crashhandler.h @@ -2,6 +2,7 @@ #define CRASHHANDLER_H #ifdef __GNUC__ +#include ; void handler(int sig); #endif From 6b320e908a737f825bc290b6f18beb1799f98e0c Mon Sep 17 00:00:00 2001 From: Troy James Sobotka Date: Mon, 13 May 2019 17:13:04 -0700 Subject: [PATCH 2/3] Typo fix Fix the semicolon. --- global/crashhandler.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/global/crashhandler.h b/global/crashhandler.h index d1de95267..af3e58198 100644 --- a/global/crashhandler.h +++ b/global/crashhandler.h @@ -2,7 +2,7 @@ #define CRASHHANDLER_H #ifdef __GNUC__ -#include ; +#include void handler(int sig); #endif From 55c5b004875bec0e0b73789df561eef9d1395ebd Mon Sep 17 00:00:00 2001 From: itsmattkc Date: Wed, 15 May 2019 14:21:36 +0000 Subject: [PATCH 3/3] use more compliant cmake functions --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 14b90e19d..caaac41b6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -562,5 +562,6 @@ if(UNIX AND NOT APPLE) install(FILES packaging/linux/icons/512x512/application-vnd.olive-project.png DESTINATION share/icons/hicolor/512x512/mimetypes) install(FILES ${OLIVE_QM_FILES} DESTINATION share/olive-editor/ts) - target_link_options(${OLIVE_TARGET} PRIVATE $<$:-rdynamic>) + set(CMAKE_CXX_FLAGS "-rdynamic ${CMAKE_CXX_FLAGS}") + set(CMAKE_SHARED_LINKER_FLAGS "-rdynamic ${CMAKE_SHARED_LINKER_FLAGS}") endif()