Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
X
xpdevplus
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
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
Deucе
xpdevplus
Commits
8149b760
Commit
8149b760
authored
3 years ago
by
Stephen Hurd
Browse files
Options
Downloads
Patches
Plain Diff
Define NO_X when appropriate, ciolib depends on encode as well as hash
parent
fe1b5820
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
ciolib/CMakeLists.txt
+3
-1
3 additions, 1 deletion
ciolib/CMakeLists.txt
with
3 additions
and
1 deletion
ciolib/CMakeLists.txt
+
3
−
1
View file @
8149b760
...
@@ -80,6 +80,8 @@ target_include_directories(ciolib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
...
@@ -80,6 +80,8 @@ target_include_directories(ciolib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
if
(
X11_FOUND
)
if
(
X11_FOUND
)
target_include_directories
(
ciolib PRIVATE
${
X11_INCLUDE_DIR
}
)
target_include_directories
(
ciolib PRIVATE
${
X11_INCLUDE_DIR
}
)
else
()
target_compile_definitions
(
ciolib PRIVATE NO_X
)
endif
()
endif
()
target_compile_definitions
(
ciolib PRIVATE CIOLIB_EXPORTS
)
target_compile_definitions
(
ciolib PRIVATE CIOLIB_EXPORTS
)
...
@@ -106,7 +108,7 @@ CHECK_FUNCTION_EXISTS(vasprintf HAVE_VASPRINTF)
...
@@ -106,7 +108,7 @@ CHECK_FUNCTION_EXISTS(vasprintf HAVE_VASPRINTF)
if
(
HAVE_VASPRINTF
)
if
(
HAVE_VASPRINTF
)
target_compile_definitions
(
ciolib PRIVATE HAVE_VASPRINTF
)
target_compile_definitions
(
ciolib PRIVATE HAVE_VASPRINTF
)
endif
()
endif
()
target_link_libraries
(
ciolib hash xpdev
)
target_link_libraries
(
ciolib hash
encode
xpdev
)
install
(
install
(
FILES
${
HEADER
}
FILES
${
HEADER
}
...
...
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