lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-04-22 06:02:03 +02:00
Code Activity

cmake: fix setting definition

Browse source 
- definitions should be set with COMPILE_DEFINITIONS

Change-Id: Icdd47a010fd51ff4f061ef744d9004ef6b8fca2e
Gitlab: #262, #263
This commit is contained in:
ababi 2021-02-05 09:27:17 +01:00
parent 8caf659bb8
commit 5d460b089f
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMakeLists.txt
View file

@ -13,8 +13,8 @@ set(CMAKE_AUTOUIC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(SRC_DIR ${PROJECT_SOURCE_DIR}/src) set(SRC_DIR ${PROJECT_SOURCE_DIR}/src)
set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS} set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}
-DJAMI_DATA_DIR='"'${CMAKE_INSTALL_PREFIX}/share/jami-qt'"') ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS})
set(QML_RESOURCES ${PROJECT_SOURCE_DIR}/resources.qrc) set(QML_RESOURCES ${PROJECT_SOURCE_DIR}/resources.qrc)
set(QML_RESOURCES_QML ${PROJECT_SOURCE_DIR}/qml.qrc) set(QML_RESOURCES_QML ${PROJECT_SOURCE_DIR}/qml.qrc)
@ -207,6 +207,9 @@ add_executable(${PROJECT_NAME}
${QML_RESOURCES_QML} ${QML_RESOURCES_QML}
${LRC_SRC_PATH}/webresource.qrc) ${LRC_SRC_PATH}/webresource.qrc)
target_compile_definitions(jami-qt PRIVATE
JAMI_DATA_DIR="${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}")
find_library(ringclient ringclient ${LRCLIBDIR} NO_DEFAULT_PATH) find_library(ringclient ringclient ${LRCLIBDIR} NO_DEFAULT_PATH)
find_library(qrencode qrencode) find_library(qrencode qrencode)
find_library(X11 X11) find_library(X11 X11)