Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
L
libzmq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
libzmq
Commits
6f597d0b
Commit
6f597d0b
authored
Nov 01, 2016
by
Harald
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Problem: CMake build rejects to build with openpgm enabled
Solution: add optional lookup for openpgm via pkg-config
parent
50a6c117
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
3 deletions
+24
-3
CMakeLists.txt
CMakeLists.txt
+22
-2
CMakeLists.txt
tests/CMakeLists.txt
+2
-1
No files found.
CMakeLists.txt
View file @
6f597d0b
...
...
@@ -375,11 +375,31 @@ if (MSVC)
endif
()
else
()
if
(
WITH_OPENPGM
)
message
(
FATAL_ERROR
"WITH_OPENPGM not implemented"
)
# message (FATAL_ERROR "WITH_OPENPGM not implemented")
if
(
NOT OPENPGM_PKGCONFIG_NAME
)
SET
(
OPENPGM_PKGCONFIG_NAME
"openpgm-5.2"
)
endif
(
NOT OPENPGM_PKGCONFIG_NAME
)
SET
(
OPENPGM_PKGCONFIG_NAME
${
OPENPGM_PKGCONFIG_NAME
}
CACHE STRING
"Name pkg-config shall use to find openpgm libraries and include paths"
FORCE
)
find_package
(
PkgConfig
)
pkg_check_modules
(
OPENPGM
${
OPENPGM_PKGCONFIG_NAME
}
)
if
(
OPENPGM_FOUND
)
message
(
STATUS
${
OPENPGM_PKGCONFIG_NAME
}
" found"
)
else
()
message
(
FATAL_ERROR
${
OPENPGM_PKGCONFIG_NAME
}
" not found. openpgm is searchd via `pkg-config
${
OPENPGM_PKGCONFIG_NAME
}
`. Consider providing a valid OPENPGM_PKGCONFIG_NAME"
)
endif
()
# DSO symbol visibility for openpgm
if
(
HAVE_FLAG_VISIBILITY_HIDDEN
)
elseif
(
HAVE_FLAG_LDSCOPE_HIDDEN
)
endif
()
endif
()
endif
()
...
...
@@ -780,7 +800,7 @@ endif ()
if
(
WITH_PERF_TOOL
)
foreach
(
perf-tool
${
perf-tools
}
)
add_executable
(
${
perf-tool
}
perf/
${
perf-tool
}
.cpp
)
target_link_libraries
(
${
perf-tool
}
libzmq
)
target_link_libraries
(
${
perf-tool
}
libzmq
${
OPTIONAL_LIBRARIES
}
)
if
(
RT_LIBRARY
)
target_link_libraries
(
${
perf-tool
}
${
RT_LIBRARY
}
)
...
...
tests/CMakeLists.txt
View file @
6f597d0b
...
...
@@ -138,7 +138,7 @@ if(WIN32)
endif
()
# add library and include dirs for all targets
link_libraries
(
libzmq
)
link_libraries
(
libzmq
${
OPTIONAL_LIBRARIES
}
)
include_directories
(
"
${
CMAKE_SOURCE_DIR
}
/../include"
)
foreach
(
test
${
tests
}
)
...
...
@@ -157,6 +157,7 @@ foreach(test ${tests})
endif
()
endif
()
if
(
RT_LIBRARY
)
target_link_libraries
(
${
test
}
${
RT_LIBRARY
}
)
endif
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment