Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cta
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Harbor 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
Show more breadcrumbs
dCache
cta
Commits
4b25a4e4
Commit
4b25a4e4
authored
8 years ago
by
Steven Murray
Browse files
Options
Downloads
Patches
Plain Diff
cmake rules now simply look for zeromq as opposed to zeromq3
parent
b5931542
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
cmake/Findzeromq.cmake
+5
-5
5 additions, 5 deletions
cmake/Findzeromq.cmake
tapeserver/castor/messages/CMakeLists.txt
+1
-1
1 addition, 1 deletion
tapeserver/castor/messages/CMakeLists.txt
with
6 additions
and
6 deletions
cmake/Findzeromq
3
.cmake
→
cmake/Findzeromq.cmake
+
5
−
5
View file @
4b25a4e4
...
...
@@ -15,14 +15,14 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# This module will set the following variables:
# ZEROMQ
3
_FOUND
# ZEROMQ
3
_INCLUDE_DIRS
# ZEROMQ_FOUND
# ZEROMQ_INCLUDE_DIRS
find_path
(
ZEROMQ
3
_INCLUDE_DIRS
find_path
(
ZEROMQ_INCLUDE_DIRS
zmq.h
PATHS /usr/include
NO_DEFAULT_PATH
)
include
(
FindPackageHandleStandardArgs
)
find_package_handle_standard_args
(
zeromq
3
DEFAULT_MSG
ZEROMQ
3
_INCLUDE_DIRS
)
find_package_handle_standard_args
(
zeromq DEFAULT_MSG
ZEROMQ_INCLUDE_DIRS
)
This diff is collapsed.
Click to expand it.
tapeserver/castor/messages/CMakeLists.txt
+
1
−
1
View file @
4b25a4e4
...
...
@@ -22,7 +22,7 @@ include_directories(${PROJECT_BINARY_DIR}/tapeserver)
find_package
(
openssl REQUIRED
)
find_package
(
Protobuf REQUIRED
)
find_package
(
zeromq
3
REQUIRED
)
find_package
(
zeromq REQUIRED
)
file
(
GLOB ProtoFiles
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/*.proto"
)
PROTOBUF_GENERATE_CPP
(
ProtoSources ProtoHeaders
${
ProtoFiles
}
)
...
...
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