Merge pull request #1833 from bmiklautz/fix/makecert

makecert: install header file

server/X11/xf_peer.c

@@ -49,7 +49,7 @@
 #include "xf_update.h"
 #include "xf_monitors.h"
 
-#include "makecert.h"
+#include <winpr/tools/makecert.h>
 
 #include "xf_peer.h"
 

winpr/include/CMakeLists.txt

@@ -17,3 +17,4 @@
 
 file(GLOB WINPR_HEADERS "winpr/*.h")
 install(FILES ${WINPR_HEADERS} DESTINATION include/winpr COMPONENT headers)
+install(DIRECTORY winpr/tools DESTINATION include/winpr COMPONENT headers FILES_MATCHING PATTERN "*.h")

winpr/tools/makecert/CMakeLists.txt

@@ -18,9 +18,7 @@
 set(MODULE_NAME "winpr-makecert-tool")
 set(MODULE_PREFIX "WINPR_MAKECERT_TOOL")
 
-set(${MODULE_PREFIX}_SRCS
-	makecert.c
-	makecert.h)
+set(${MODULE_PREFIX}_SRCS makecert.c)
 
 include_directories(${ZLIB_INCLUDE_DIRS})
 include_directories(${OPENSSL_INCLUDE_DIR})

winpr/tools/makecert/cli/main.c

@@ -25,7 +25,7 @@
 #include <winpr/cmdline.h>
 #include <winpr/sysinfo.h>
 
-#include "makecert.h"
+#include <winpr/tools/makecert.h>
 
 int main(int argc, char* argv[])
 {

winpr/tools/makecert/makecert.c

@@ -31,7 +31,7 @@
 #include <openssl/conf.h>
 #include <openssl/x509v3.h>
 
-#include "makecert.h"
+#include <winpr/tools/makecert.h>
 
 struct _MAKECERT_CONTEXT
 {