Fix Windows ZeroMQ for real (#357)

* Rework FindZeroMQ again for Windows
* Let Windows auto-detect ZeroMQ path

Author: ferdnyc

.gitlab-ci.yml

@@ -70,7 +70,6 @@ windows-builder-x64:
     - Expand-Archive -Path artifacts.zip -DestinationPath .
     - $env:LIBOPENSHOT_AUDIO_DIR = "$CI_PROJECT_DIR\build\install-x64"
     - $env:UNITTEST_DIR = "C:\msys64\usr"
-    - $env:ZMQDIR = "C:\msys64\usr"
     - $env:RESVGDIR = "C:\msys64\usr"
     - $env:Path = "C:\msys64\mingw64\bin;C:\msys64\mingw64\lib;C:\msys64\usr\lib\cmake\UnitTest++;C:\msys64\home\jonathan\depot_tools;C:\msys64\usr;C:\msys64\usr\lib;" + $env:Path;
     - New-Item -ItemType Directory -Force -Path build
@@ -101,7 +100,6 @@ windows-builder-x86:
     - $env:LIBOPENSHOT_AUDIO_DIR = "$CI_PROJECT_DIR\build\install-x86"
     - $env:UNITTEST_DIR = "C:\msys32\usr"
     - $env:RESVGDIR = "C:\msys32\usr"
-    - $env:ZMQDIR = "C:\msys32\usr"
     - $env:Path = "C:\msys32\mingw32\bin;C:\msys32\mingw32\lib;C:\msys32\usr\lib\cmake\UnitTest++;C:\msys32\home\jonathan\depot_tools;C:\msys32\usr;C:\msys32\usr\lib;" + $env:Path;
     - New-Item -ItemType Directory -Force -Path build
     - New-Item -ItemType Directory -Force -Path build\install-x86\python

cmake/Modules/FindZeroMQ.cmake

@@ -3,41 +3,32 @@ find_package(PkgConfig)
 pkg_check_modules(PC_LIBZMQ QUIET libzmq)
 
 set(ZeroMQ_VERSION ${PC_LIBZMQ_VERSION})
-find_path(ZeroMQ_INCLUDE_DIR zmq.h PATHS ${PC_LIBZMQ_INCLUDE_DIRS} $ENV{ZMQDIR})
 
-find_library(ZeroMQ_LIBRARY NAMES libzmq.so libzmq.dylib libzmq.dll
-PATHS ${PC_LIBZMQ_LIBDIR} ${PC_LIBZMQ_LIBRARY_DIRS} $ENV{ZMQDIR})
-find_library(ZeroMQ_STATIC_LIBRARY NAMES libzmq-static.a libzmq.a libzmq.dll.a
-             PATHS ${PC_LIBZMQ_LIBDIR} ${PC_LIBZMQ_LIBRARY_DIRS} $ENV{ZMQDIR})
+find_path(ZeroMQ_INCLUDE_DIR zmq.h
+	  PATHS ${ZeroMQ_DIR}/include
+                ${PC_LIBZMQ_INCLUDE_DIRS})
 
-if(ZeroMQ_LIBRARY OR ZeroMQ_STATIC_LIBRARY)
-    set(ZeroMQ_FOUND ON)
-endif()
-
-if (TARGET libzmq)
-    # avoid errors defining targets twice
-    return()
-endif()
-
-set(ZeroMQ_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIR})
-list(APPEND ZeroMQ_INCLUDE_DIRS ${PC_LIBZMQ_INCLUDE_DIRS})
-list(REMOVE_DUPLICATES ZeroMQ_INCLUDE_DIRS)
+find_library(ZeroMQ_LIBRARY
+	     NAMES zmq
+	     PATHS ${ZeroMQ_DIR}/lib
+                   ${PC_LIBZMQ_LIBDIR}
+		   ${PC_LIBZMQ_LIBRARY_DIRS})
 
 if(ZeroMQ_LIBRARY)
-    add_library(libzmq SHARED IMPORTED)
-    set_property(TARGET libzmq PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${ZeroMQ_INCLUDE_DIRS})
-    set_property(TARGET libzmq PROPERTY IMPORTED_LOCATION ${ZeroMQ_LIBRARY})
+    set(ZeroMQ_FOUND ON)
 endif()
 
-if(ZeroMQ_LIBRARY_STATIC)
-    add_library(libzmq-static STATIC IMPORTED ${ZeroMQ_INCLUDE_DIRS})
-    set_property(TARGET libzmq-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${ZeroMQ_INCLUDE_DIRS})
-    set_property(TARGET libzmq-static PROPERTY IMPORTED_LOCATION ${ZeroMQ_STATIC_LIBRARY})
+set ( ZeroMQ_LIBRARIES ${ZeroMQ_LIBRARY} )
+set ( ZeroMQ_INCLUDE_DIRS ${ZeroMQ_INCLUDE_DIR} )
+
+if(NOT TARGET libzmq)
+	add_library(libzmq UNKNOWN IMPORTED)
+	set_target_properties(libzmq PROPERTIES
+		IMPORTED_LOCATION ${ZeroMQ_LIBRARIES}
+		INTERFACE_INCLUDE_DIRECTORIES ${ZeroMQ_INCLUDE_DIRS})
 endif()
 
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(ZeroMQ
-  REQUIRED_VARS
-    ZeroMQ_LIBRARY ZeroMQ_INCLUDE_DIRS
-  VERSION_VAR
-    ZeroMQ_VERSION)
+include ( FindPackageHandleStandardArgs )
+# handle the QUIETLY and REQUIRED arguments and set ZMQ_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args ( ZeroMQ DEFAULT_MSG ZeroMQ_LIBRARIES ZeroMQ_INCLUDE_DIRS )

src/CMakeLists.txt

@@ -330,11 +330,9 @@ find_package(ZeroMQ REQUIRED) # Creates libzmq target
 # others (Ubuntu) bundle them in with libzmq itself
 find_package(cppzmq QUIET) # Creates cppzmq target
 
-# Link ZeroMQ (shared or static, whichever's found)
+# Link ZeroMQ library
 if (TARGET libzmq)
 	target_link_libraries(openshot PUBLIC libzmq)
-elseif (TARGET libzmq-static)
-	target_link_libraries(openshot PRIVATE libzmq-static)
 endif()
 # Include cppzmq headers, if not bundled into libzmq
 if (TARGET cppzmq)
@@ -373,6 +371,7 @@ target_link_libraries(openshot PUBLIC ${REQUIRED_LIBRARIES})
 # Pick up parameters from OpenMP target and propagate
 target_link_libraries(openshot PUBLIC OpenMP::OpenMP_CXX)
 
+
 ############### CLI EXECUTABLES ################
 # Create test executable
 add_executable(openshot-example examples/Example.cpp)