blob: 43eb4a7438787436479a56705633611ec92147c7 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9d0501d..efda8f09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -26,6 +26,9 @@ project(linphoneqt VERSION 4.1.1)
set(APP_LIBRARY app-library)
include(application_info.cmake)
+# Pointing RPATH to /opt/linphone-desktop/lib{,64} to be used when installing
+SET(CMAKE_INSTALL_RPATH "/opt/linphone-desktop/lib:/opt/linphone-desktop/lib64")
+
# ------------------------------------------------------------------------------
set(TARGET_NAME linphone-qt)
diff --git a/submodules/externals/soci/cmake/SociConfig.cmake b/submodules/externals/soci/cmake/SociConfig.cmake
index 5ac4ce06..8e936a68 100644
--- a/submodules/externals/soci/cmake/SociConfig.cmake
+++ b/submodules/externals/soci/cmake/SociConfig.cmake
@@ -51,7 +51,7 @@ if (MSVC)
else()
set(SOCI_GCC_CLANG_COMMON_FLAGS
- "-pedantic -Werror -Wno-error=parentheses -Wall -Wextra -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Woverloaded-virtual -Wredundant-decls -Wno-long-long")
+ "-pedantic -Wno-error=parentheses -Wall -Wextra -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Woverloaded-virtual -Wredundant-decls -Wno-long-long")
set(SOCI_CXX_VERSION_FLAGS "-std=c++11")
|