Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
dhtnet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
dhtnet
Commits
23158303
Commit
23158303
authored
1 year ago
by
Amna Snene
Browse files
Options
Downloads
Patches
Plain Diff
cmake: fix pkg-config in static mode
Change-Id: Ic2397eee6ea67fc5d0b76ce77bbd8e000f90177c
parent
036612b0
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
Dockerfile
+1
-1
1 addition, 1 deletion
Dockerfile
with
2 additions
and
2 deletions
CMakeLists.txt
+
1
−
1
View file @
23158303
...
...
@@ -37,7 +37,7 @@ if (NOT MSVC)
set
(
CMAKE_FIND_ROOT_PATH_MODE_PACKAGE BOTH
)
list
(
APPEND CMAKE_PREFIX_PATH
${
DEPENDENCIES_PATH
}
)
find_package
(
PkgConfig REQUIRED
)
if
(
BUILD_S
TATIC
)
if
(
NOT
BUILD_S
HARED_LIBS
)
list
(
APPEND PKG_CONFIG_EXECUTABLE
"--static"
)
endif
()
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
1
−
1
View file @
23158303
...
...
@@ -6,7 +6,7 @@ RUN apk add --no-cache \
cppunit-dev gnutls-dev jsoncpp-dev
\
argon2-dev openssl-dev fmt-dev
\
http-parser-dev asio-dev msgpack-cxx-dev
\
readline-dev
readline-dev
yaml-cpp-dev libunistring-dev
# Build restinio
RUN
mkdir
restinio
&&
cd
restinio
\
...
...
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