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
81f57ea4
Commit
81f57ea4
authored
10 months ago
by
Joscha Schmiedt
Browse files
Options
Downloads
Patches
Plain Diff
Re-add CMAKE_MODULE_PATH
parent
14d76b47
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!61
Release 0.3.0
,
!49
Resolve "EXTERN: Adapt to Conan 2"
Pipeline
#51751
failed
10 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
+11
-11
11 additions, 11 deletions
CMakeLists.txt
with
11 additions
and
11 deletions
CMakeLists.txt
+
11
−
11
View file @
81f57ea4
...
...
@@ -40,7 +40,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
set
(
CMAKE_CXX_STANDARD_REQUIRED ON
)
set
(
CMAKE_EXPORT_COMPILE_COMMANDS ON
)
#
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
set
(
CMAKE_MODULE_PATH
"
${
PROJECT_SOURCE_DIR
}
/cmake"
${
CMAKE_MODULE_PATH
}
)
IF
(
WIN32
)
set
(
CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON
)
...
...
@@ -166,24 +166,24 @@ find_package(GTest)
if
(
"
${
CMAKE_BUILD_TYPE
}
"
MATCHES
"Debug"
)
add_library
(
caosdb_grpc SHARED
${
GRPC_GENERATED
}
)
add_library
(
caosdb SHARED
${
libcaosdb_INCL
}
${
libcaosdb_SRC
}
)
target_link_libraries
(
caosdb caosdb_grpc
target_link_libraries
(
caosdb caosdb_grpc
grpc::grpc protobuf::protobuf boost::boost gtest::gtest
)
set
(
LIBCAOSDB caosdb caosdb_grpc
)
set
(
LIBCAOSDB caosdb caosdb_grpc
)
target_include_directories
(
caosdb_grpc PUBLIC
target_include_directories
(
caosdb_grpc PUBLIC
$<BUILD_INTERFACE:
${
libcaosdb_SOURCE_DIR
}
/include>
$<BUILD_INTERFACE:
${
libcaosdb_BINARY_DIR
}
/include>
$<INSTALL_INTERFACE:include>
)
target_include_directories
(
caosdb_grpc SYSTEM PUBLIC
)
target_include_directories
(
caosdb_grpc SYSTEM PUBLIC
${
CONAN_INCLUDE_DIRS
}
)
)
else
()
add_library
(
caosdb
SHARED
${
libcaosdb_INCL
}
${
libcaosdb_SRC
}
${
GRPC_GENERATED
}
)
set
(
LIBCAOSDB caosdb
)
add_library
(
caosdb
SHARED
${
libcaosdb_INCL
}
${
libcaosdb_SRC
}
${
GRPC_GENERATED
}
)
set
(
LIBCAOSDB caosdb
)
endif
()
target_link_libraries
(
caosdb
grpc::grpc protobuf::protobuf boost::boost gtest::gtest
stdc++fs
...
...
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