Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
caosdb-cpplib
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
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
Code review analytics
Issue 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
caosdb
Software
caosdb-cpplib
Commits
f2e382ec
Commit
f2e382ec
authored
9 months ago
by
Joscha Schmiedt
Browse files
Options
Downloads
Patches
Plain Diff
FIX: Don't link to stdc++fs on Win32
parent
5b0559c6
Branches
Branches containing commit
Tags
Tags containing commit
2 merge requests
!61
Release 0.3.0
,
!48
Fix compilation errors on Windows
Pipeline
#54249
failed
9 months ago
Stage: info
Stage: setup
Stage: test
Stage: deploy
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+4
-4
4 additions, 4 deletions
CMakeLists.txt
with
4 additions
and
4 deletions
CMakeLists.txt
+
4
−
4
View file @
f2e382ec
...
...
@@ -101,9 +101,11 @@ set(PROTO_PATH ${PROJECT_SOURCE_DIR}/proto/proto)
IF
(
WIN32
)
set
(
_PROTOBUF_PROTOC
"
${
CMAKE_BINARY_DIR
}
/build_tools/protoc.exe"
)
set
(
_GRPC_CPP_PLUGIN_EXECUTABLE
"
${
CMAKE_BINARY_DIR
}
/build_tools/grpc_cpp_plugin.exe"
)
set
(
STDFSLIB
""
)
ELSE
()
set
(
_PROTOBUF_PROTOC
"
${
CMAKE_BINARY_DIR
}
/build_tools/protoc"
)
set
(
_GRPC_CPP_PLUGIN_EXECUTABLE
"
${
CMAKE_BINARY_DIR
}
/build_tools/grpc_cpp_plugin"
)
set
(
STDFSLIB stdc++fs
)
ENDIF
()
# Generated sources
...
...
@@ -199,8 +201,7 @@ else()
add_library
(
caosdb
SHARED
${
libcaosdb_INCL
}
${
libcaosdb_SRC
}
${
GRPC_GENERATED
}
)
target_link_libraries
(
caosdb
grpc::grpc protobuf::protobuf boost::boost
stdc++fs
grpc::grpc protobuf::protobuf boost::boost
${
STDFSLIB
}
)
set
(
LIBCAOSDB caosdb
)
endif
()
...
...
@@ -221,8 +222,7 @@ target_include_directories(caosdb PUBLIC
add_library
(
ccaosdb SHARED src/ccaosdb.cpp
)
target_link_libraries
(
ccaosdb
grpc::grpc protobuf::protobuf boost::boost
${
LIBCAOSDB
}
stdc++fs
${
LIBCAOSDB
}
$
(
STDFSLIB
)
)
target_include_directories
(
ccaosdb PUBLIC
$<BUILD_INTERFACE:
${
libcaosdb_SOURCE_DIR
}
/include>
...
...
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