Merge branch 'cpack'

.appveyor.yml

@@ -47,6 +47,8 @@ matrix:
       VCPKG_TARGET_TRIPLET: x64-windows
     - image: Visual Studio 2015
       GENERATOR: Unix Makefiles
+  allow_failures:
+    - GENERATOR: MSYS Makefiles
 
 for:
 -
@@ -106,6 +108,22 @@ before_build:
   - cmake -G"%GENERATOR%" -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake -DVCPKG_TARGET_TRIPLET=%VCPKG_TARGET_TRIPLET% -DCMAKE_BUILD_TYPE=%CONFIGURATION% -DBUILD_SHARED_LIBS:BOOL=on ..
 build_script:
   - cmake --build . --config %CONFIGURATION%
+  - cmake --build . --config %CONFIGURATION% --target package
 test_script:
   - ctest --output-on-failure
 cache: c:\tools\vcpkg\installed
+
+artifacts:
+  - path: 'build/*.zip'
+    name: Installer
+
+deploy:
+  provider: GitHub
+  auth_token:
+    secure: vS1tzVAgt5X3XMnX0ioCMmr43MPQdP+im29avhhQOaRZ2BB8QRdtoRdOMmzARBmS
+  artifact: Installer
+  draft: true
+  on:
+    APPVEYOR_REPO_TAG: true
+    branch: master
+    configuration: Release

CMakeLists.txt

@@ -75,8 +75,10 @@ if(NOT ${OPENVIZSLA_LIBRARY_TYPE} STREQUAL "STATIC_LIBRARY")
 
 	add_library(openvizsla_static STATIC EXCLUDE_FROM_ALL ${SOURCES})
 	target_link_libraries(openvizsla_static LibZip::zip ${LIBRARIES})
-	set_target_properties(openvizsla_static PROPERTIES
-		ARCHIVE_OUTPUT_NAME openvizsla)
+	if(NOT WIN32)
+		set_target_properties(openvizsla_static PROPERTIES
+			ARCHIVE_OUTPUT_NAME openvizsla)
+	endif()
 	target_compile_definitions(openvizsla_static PUBLIC "_XOPEN_SOURCE;_XOPEN_SOURCE_EXTENDED")
 	target_compile_definitions(openvizsla_static PRIVATE "OPENVIZSLA_STATIC_DEFINE")
 
@@ -137,11 +139,16 @@ foreach(test_source IN ITEMS ${TESTS})
 endforeach(test_source)
 
 install(TARGETS openvizsla
-	DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR})
+	DESTINATION ${CMAKE_INSTALL_LIBDIR})
 install(FILES "include/openvizsla.h"
-	DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/openvizsla)
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/openvizsla)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/openvizsla_export.h"
-	DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/openvizsla)
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/openvizsla)
 configure_file("openvizsla.pc.in" "openvizsla.pc" @ONLY)
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/openvizsla.pc"
-	DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
+	DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+
+if(WIN32)
+	set(CPACK_GENERATOR "ZIP")
+	include(CPack)
+endif()