Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-client-qt
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-client-qt
Commits
4794cc87
Commit
4794cc87
authored
2 years ago
by
Aline Gondim Santos
Browse files
Options
Downloads
Patches
Plain Diff
build: fix DAEMON_DIR definition
Change-Id: I55d1e26b6710f8b53bd28fce82427c86bbed7eda
parent
cff18909
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+10
-6
10 additions, 6 deletions
CMakeLists.txt
with
10 additions
and
6 deletions
CMakeLists.txt
+
10
−
6
View file @
4794cc87
...
...
@@ -39,8 +39,16 @@ set(CMAKE_AUTOUIC ON)
set
(
CMAKE_INCLUDE_CURRENT_DIR ON
)
# 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
set
(
LIBCLIENT_SRC_DIR
${
PROJECT_SOURCE_DIR
}
/src/libclient
)
set
(
APP_SRC_DIR
${
PROJECT_SOURCE_DIR
}
/src/app
)
...
...
@@ -105,10 +113,6 @@ set(CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
${
Qt6Widgets_EXECUTABLE_COMPILE_FLAGS
}
)
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
)
message
(
FATAL_ERROR
"Jami Daemon sources not found in
${
DAEMON_DIR
}
/src. If you \
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment