Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
libdap-server
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
cellframe
libdap-server
Commits
9e7533d5
Commit
9e7533d5
authored
5 years ago
by
Constantin Papizh
Browse files
Options
Downloads
Patches
Plain Diff
Windows build fixed
parent
4a84966d
No related branches found
No related tags found
1 merge request
!3
Windows build fixed
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
enc_server/CMakeLists.txt
+1
-2
1 addition, 2 deletions
enc_server/CMakeLists.txt
http_server/CMakeLists.txt
+2
-3
2 additions, 3 deletions
http_server/CMakeLists.txt
with
3 additions
and
5 deletions
enc_server/CMakeLists.txt
+
1
−
2
View file @
9e7533d5
...
...
@@ -21,7 +21,6 @@ if(WIN32)
include_directories
(
../../3rdparty/wepoll/include/
)
include_directories
(
../../3rdparty/uthash/src/
)
include_directories
(
../../3rdparty/libjson-c/
)
include_directories
(
../../3rdparty/libmagic/src/
)
include_directories
(
../../3rdparty/curl/include/
)
endif
()
...
...
@@ -31,7 +30,7 @@ if(WIN32)
target_link_libraries
(
dap_enc_server dap_core dap_crypto dap_server_core dap_http_server
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../lib/[x86_64CLANG]/libmemcached[x86_64CLANG].a
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../lib/[x86_64CLANG]/libmagic[x86_64CLANG].a
#
${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/libmagic[x86_64CLANG].a
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../lib/[x86_64CLANG]/curl[x86_64CLANG].a
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../lib/[x86_64CLANG]/libjson-c[x86_64CLANG].a
KERNEL32
...
...
This diff is collapsed.
Click to expand it.
http_server/CMakeLists.txt
+
2
−
3
View file @
9e7533d5
...
...
@@ -30,7 +30,6 @@ if(WIN32)
include_directories
(
../../3rdparty/wepoll/include/
)
include_directories
(
../../3rdparty/uthash/src/
)
include_directories
(
../../3rdparty/libjson-c/
)
include_directories
(
../../3rdparty/libmagic/src/
)
include_directories
(
../../3rdparty/curl/include/
)
endif
()
...
...
@@ -39,10 +38,10 @@ add_library(${PROJECT_NAME} STATIC ${HTTP_SERVER_SRCS})
target_include_directories
(
dap_http_server INTERFACE . http_client
)
if
(
WIN32
)
target_link_libraries
(
dap_http_server dap_core dap_crypto dap_server_core
target_link_libraries
(
dap_http_server dap_core dap_crypto dap_server_core
magic regex tre intl iconv
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../lib/[x86_64CLANG]/libmemcached[x86_64CLANG].a
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../lib/[x86_64CLANG]/libmagic[x86_64CLANG].a
#
${CMAKE_CURRENT_SOURCE_DIR}/../../lib/[x86_64CLANG]/libmagic[x86_64CLANG].a
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../lib/[x86_64CLANG]/curl[x86_64CLANG].a
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../lib/[x86_64CLANG]/wepoll[x86_64CLANG].a
KERNEL32
...
...
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