Merge pull request #1495 from ggbecker/fix-windows-build-on-fresh-appveyor-maint_1-3

Use pthread required package when building on Windows.

Author: jan-cerny

CMakeLists.txt

@@ -143,10 +143,16 @@ find_package(LibXslt REQUIRED)
 find_package(BZip2)
 
 # PThread
+if (WIN32)
+	find_package(ZLIB REQUIRED)
+	find_package(pthread CONFIG REQUIRED)
+	set(CMAKE_THREAD_LIBS_INIT ${PThreads4W_LIBRARY})
+else()
+	find_package(Threads REQUIRED)
+endif()
 set(CMAKE_THREAD_PREFER_PTHREAD)
 set(THREADS_PREFER_PTHREAD_FLAG)
-set(THREADS_USE_PTHREADS_WIN32 true)
-find_package(Threads REQUIRED)
+set(THREADS_USE_PTHREADS_WIN32 TRUE)
 check_library_exists(pthread pthread_timedjoin_np "" HAVE_PTHREAD_TIMEDJOIN_NP)
 check_library_exists(pthread pthread_setname_np "" HAVE_PTHREAD_SETNAME_NP)
 check_library_exists(pthread pthread_getname_np "" HAVE_PTHREAD_GETNAME_NP)

appveyor.yml

@@ -7,7 +7,7 @@ image: Visual Studio 2017
 configuration: Release
 clone_folder: c:\projects\openscap
 install:
-- cmd: vcpkg install curl libxml2 libxslt bzip2 pcre pthreads
+- cmd: vcpkg install curl libxml2 libxslt bzip2 pcre pthreads zlib getopt-win32
 cache: c:\tools\vcpkg\installed\
 before_build:
 - cmd: >-

cmake/FindThreads.cmake

@@ -10,6 +10,17 @@ if(ENABLE_OSCAP_UTIL)
 	add_executable(oscap ${UTILS_SOURCES})
 	target_link_libraries(oscap openscap)
 	if(WIN32)
+		find_path(GETOPT_INCLUDE_DIR getopt.h)
+		include(SelectLibraryConfigurations)
+		find_library(GETOPT_LIBRARY_RELEASE NAMES getopt)
+		find_library(GETOPT_LIBRARY_DEBUG NAMES getopt PATH_SUFFIXES debug/lib)
+		select_library_configurations(GETOPT)
+
+		message("GETOPT_INCLUDE_DIR: ${GETOPT_INCLUDE_DIR}")
+		message("GETOPT_LIBRARY: ${GETOPT_LIBRARY}")
+
+		target_include_directories(oscap PRIVATE ${GETOPT_INCLUDE_DIR})
+		target_link_libraries(oscap PRIVATE ${GETOPT_LIBRARY})
 		set(OSCAP_UTIL_DESTINATION ".")
 		# Install the 'oscap' utility
 		install(TARGETS "oscap"