Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
opendht
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Model registry
Analyze
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
opendht
Commits
e753d200
Commit
e753d200
authored
3 years ago
by
Sprite
Committed by
Adrien Béraud
3 years ago
Browse files
Options
Downloads
Patches
Plain Diff
cmake: fix incorrect variable name
parent
85fd395c
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+6
-6
6 additions, 6 deletions
CMakeLists.txt
cmake/CheckAtomic.cmake
+1
-0
1 addition, 0 deletions
cmake/CheckAtomic.cmake
with
7 additions
and
6 deletions
CMakeLists.txt
+
6
−
6
View file @
e753d200
...
...
@@ -320,8 +320,8 @@ if (OPENDHT_STATIC)
PUBLIC
${
CMAKE_THREAD_LIBS_INIT
}
${
GNUTLS_LIBRARIES
}
${
Nettle_STATIC_LIBRARIES
}
${
Jsoncpp_STATIC_LIBRARIES
}
${
FMT_LIBRARY
}
${
HTTP_PARSER_LIBRARY
}
${
OPENSSL_STATIC_LIBRARIES
}
)
if
(
NOT HAVE_CXX_ATOMICS_
RISC_V_
WITHOUT_LIB
)
target_link_libraries
(
opendht-static PUBLIC
"
atomic
"
)
if
(
NOT HAVE_CXX_ATOMICS_WITHOUT_LIB
)
target_link_libraries
(
opendht-static PUBLIC atomic
)
endif
()
else
()
if
(
OPENDHT_TOOLS
)
...
...
@@ -396,8 +396,8 @@ if (OPENDHT_SHARED)
PRIVATE
${
GNUTLS_LIBRARIES
}
${
Nettle_LIBRARIES
}
${
Jsoncpp_LIBRARIES
}
${
FMT_LIBRARY
}
${
HTTP_PARSER_LIBRARY
}
${
argon2_LIBRARIES
}
)
if
(
NOT HAVE_CXX_ATOMICS_
RISC_V_
WITHOUT_LIB
)
target_link_libraries
(
opendht PUBLIC
"
atomic
"
)
if
(
NOT HAVE_CXX_ATOMICS_WITHOUT_LIB
)
target_link_libraries
(
opendht PUBLIC atomic
)
endif
()
endif
()
...
...
@@ -503,8 +503,8 @@ if (OPENDHT_TESTS)
${
GNUTLS_LIBRARIES
}
${
Jsoncpp_LIBRARIES
}
)
if
(
NOT HAVE_CXX_ATOMICS_
RISC_V_
WITHOUT_LIB
)
target_link_libraries
(
opendht_unit_tests
"
atomic
"
)
if
(
NOT HAVE_CXX_ATOMICS_WITHOUT_LIB
)
target_link_libraries
(
opendht_unit_tests atomic
)
endif
()
if
(
OPENDHT_PROXY_OPENSSL
)
target_link_libraries
(
opendht_unit_tests
${
OPENSSL_LIBRARIES
}
)
...
...
This diff is collapsed.
Click to expand it.
cmake/CheckAtomic.cmake
+
1
−
0
View file @
e753d200
...
...
@@ -38,6 +38,7 @@ int main() {
set
(
CMAKE_REQUIRED_FLAGS
${
OLD_CMAKE_REQUIRED_FLAGS
}
)
endfunction
(
check_working_cxx_atomics64
)
# This isn't necessary on MSVC, so avoid command-line switch annoyance
# by only running on GCC-like hosts.
if
(
LLVM_COMPILER_IS_GCC_COMPATIBLE
)
...
...
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