@@ -148,10 +148,12 @@ set(OPTIONAL_LIBRARIES_STATIC)
148
148
########################################################################
149
149
.if use.optional = 0
150
150
find_package($(use.project) REQUIRED)
151
+ IF ($(USE.PROJECT)_FOUND)
151
152
.else
152
153
find_package($(use.project))
154
+ option($(PROJECT.PREFIX)_WITH_$(USE.PROJECT) "Build czmq with $(use.project)" ${$(USE.PROJECT)_FOUND})
155
+ IF ($(PROJECT.PREFIX)_WITH_$(USE.PROJECT) AND $(USE.PROJECT)_FOUND)
153
156
.endif
154
- IF ($(USE.PROJECT)_FOUND)
155
157
.if use.libname ?<> ""
156
158
include_directories(${$(USE.PROJECT)_INCLUDE_DIRS})
157
159
list(APPEND MORE_LIBRARIES ${$(USE.PROJECT)_LIBRARIES})
@@ -187,8 +189,10 @@ IF ($(USE.PROJECT)_FOUND)
187
189
.if use.optional = 0
188
190
ELSE ($(USE.PROJECT)_FOUND)
189
191
message( FATAL_ERROR "$(use.project) not found." )
190
- .endif
191
192
ENDIF ($(USE.PROJECT)_FOUND)
193
+ .else
194
+ ENDIF ($(PROJECT.PREFIX)_WITH_$(USE.PROJECT) AND $(USE.PROJECT)_FOUND)
195
+ .endif
192
196
.endfor
193
197
194
198
########################################################################
@@ -661,7 +665,7 @@ find_path (
661
665
HINTS ${PC_$(USE.PROJECT)_INCLUDE_HINTS}
662
666
)
663
667
664
- . if use.libname = "libzmq"
668
+ . if use.libname ? = "libzmq"
665
669
if (MSVC)
666
670
# libzmq dll/lib built with MSVC is named using the Boost convention.
667
671
# https://github.com/zeromq/czmq/issues/577
@@ -683,9 +687,6 @@ if (MSVC)
683
687
684
688
set(_zmq_version ${ZMQ_VERSION_MAJOR}_${ZMQ_VERSION_MINOR}_${ZMQ_VERSION_PATCH})
685
689
686
- set(_zmq_debug_names)
687
- set(_zmq_release_names)
688
-
689
690
set(_zmq_debug_names
690
691
"libzmq${MSVC_TOOLSET}-mt-gd-${_zmq_version}" # Debug, BUILD_SHARED
691
692
"libzmq${MSVC_TOOLSET}-mt-sgd-${_zmq_version}" # Debug, BUILD_STATIC
@@ -700,37 +701,33 @@ if (MSVC)
700
701
"libzmq-mt-s-${_zmq_version}" # Release|RelWithDebInfo|MinSizeRel, BUILD_STATIC
701
702
)
702
703
703
- find_library (ZeroMQ_LIBRARY_DEBUG
704
+ find_library (LIBZMQ_LIBRARY_DEBUG
704
705
NAMES ${_zmq_debug_names}
705
706
)
706
707
707
- find_library (ZeroMQ_LIBRARY_RELEASE
708
+ find_library (LIBZMQ_LIBRARY_RELEASE
708
709
NAMES ${_zmq_release_names}
709
710
)
710
711
711
- if (ZeroMQ_LIBRARY_RELEASE AND ZeroMQ_LIBRARY_DEBUG)
712
- set(LIBZMQ_LIBRARIES
713
- debug ${ZeroMQ_LIBRARY_DEBUG}
714
- optimized ${ZeroMQ_LIBRARY_RELEASE}
715
- )
716
- elseif (ZeroMQ_LIBRARY_RELEASE)
717
- set(LIBZMQ_LIBRARIES ${ZeroMQ_LIBRARY_RELEASE})
718
- elseif (ZeroMQ_LIBRARY_DEBUG)
719
- set(LIBZMQ_LIBRARIES ${ZeroMQ_LIBRARY_DEBUG})
720
- endif ()
712
+ include(SelectLibraryConfigurations)
713
+ select_library_configurations(LIBZMQ)
721
714
endif ()
722
715
723
716
if (NOT LIBZMQ_LIBRARIES)
724
717
find_library (
725
718
LIBZMQ_LIBRARIES
726
- NAMES zmq libzmq
719
+ NAMES libzmq zmq
727
720
HINTS ${PC_LIBZMQ_LIBRARY_HINTS}
728
721
)
729
722
endif ()
730
723
. else
731
724
find_library (
732
725
$(USE.PROJECT)_LIBRARIES
726
+ . if use.libname ?<> use.linkname
727
+ NAMES $(use.libname) $(use.linkname)
728
+ . else
733
729
NAMES $(use.linkname)
730
+ . endif
734
731
HINTS ${PC_$(USE.PROJECT)_LIBRARY_HINTS}
735
732
)
736
733
. endif
0 commit comments