lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-09-03 21:53:43 +02:00
Code Activity

build: fix DAEMON_DIR definition

Browse source 
Change-Id: I55d1e26b6710f8b53bd28fce82427c86bbed7eda
This commit is contained in:
Aline Gondim Santos 2022-12-15 15:48:32 -03:00
parent cff189090b
commit 4794cc87d3
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
CMakeLists.txt
View file

@ -39,8 +39,16 @@ set(CMAKE_AUTOUIC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Main project directories: # Main project directories:
# daemon
set(DAEMON_DIR ${PROJECT_SOURCE_DIR}/daemon) # jami-daemon
if(NOT DEFINED WITH_DAEMON_SUBMODULE)
set(WITH_DAEMON_SUBMODULE false)
# daemon
set(DAEMON_DIR ${PROJECT_SOURCE_DIR}/../daemon)
else()
# daemon
set(DAEMON_DIR ${PROJECT_SOURCE_DIR}/daemon)
endif()
# src # src
set(LIBCLIENT_SRC_DIR ${PROJECT_SOURCE_DIR}/src/libclient) set(LIBCLIENT_SRC_DIR ${PROJECT_SOURCE_DIR}/src/libclient)
set(APP_SRC_DIR ${PROJECT_SOURCE_DIR}/src/app) set(APP_SRC_DIR ${PROJECT_SOURCE_DIR}/src/app)
@ -105,10 +113,6 @@ set(CMAKE_CXX_FLAGS
${CMAKE_CXX_FLAGS} ${Qt6Widgets_EXECUTABLE_COMPILE_FLAGS}) ${CMAKE_CXX_FLAGS} ${Qt6Widgets_EXECUTABLE_COMPILE_FLAGS})
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH true)
# jami-daemon
if(NOT DEFINED WITH_DAEMON_SUBMODULE)
set(WITH_DAEMON_SUBMODULE false)
endif()
if (WITH_DAEMON_SUBMODULE AND NOT EXISTS ${DAEMON_DIR}/src) if (WITH_DAEMON_SUBMODULE AND NOT EXISTS ${DAEMON_DIR}/src)
message(FATAL_ERROR message(FATAL_ERROR
"Jami Daemon sources not found in ${DAEMON_DIR}/src. If you \ "Jami Daemon sources not found in ${DAEMON_DIR}/src. If you \