X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;ds=sidebyside;f=win%2FCMakeLists.txt;h=2df48883f63c838277931de4eabcd514a7db1a1f;hb=4a126ad130b0a51449343de2f2db6becca0d2819;hp=e8ff42d1ee54b1740163b613da4da065caf50167;hpb=98372c3cf2c1455e41c388d822876a4d146ae76d;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt
index e8ff42d1e..2df48883f 100644
--- a/win/CMakeLists.txt
+++ b/win/CMakeLists.txt
@@ -23,6 +23,7 @@ file(STRINGS "${INSPIRCD_BASE}/src/version.sh" VERSIONSH)
 string(REGEX REPLACE ".*InspIRCd-([0-9]*).*" "\\1" VERSION_MAJOR "${VERSIONSH}")
 string(REGEX REPLACE ".*InspIRCd-[0-9]*\\.([0-9]*).*" "\\1" VERSION_MINOR "${VERSIONSH}")
 string(REGEX REPLACE ".*InspIRCd-[0-9]*\\.[0-9]*\\.([0-9]*).*" "\\1" VERSION_PATCH "${VERSIONSH}")
+string(REGEX REPLACE ".*InspIRCd-([^\"]+).*" "\\1" VERSION_FULL "${VERSIONSH}")
 
 if(MSVC)
 	# Without /SAFESEH:NO old libraries compiled with VS 2010 or older won't link correctly to VS2012 (eg, extra module libs)
@@ -47,6 +48,13 @@ file(GLOB INSPIRCD_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
 "${INSPIRCD_BASE}/src/threadengines/threadengine_win32.cpp")
 list(SORT INSPIRCD_SOURCES)
 
+file(GLOB INSPIRCD_VENDORS "${INSPIRCD_BASE}/vendor/**")
+foreach(INSPIRCD_VENDOR ${INSPIRCD_VENDORS})
+	if(IS_DIRECTORY ${INSPIRCD_VENDOR})
+		include_directories(${INSPIRCD_VENDOR})
+	endif()
+endforeach()
+
 include_directories("${INSPIRCD_BASE}/win" "${INSPIRCD_BASE}/include")
 
 include_directories(${EXTRA_INCLUDES})
@@ -94,7 +102,7 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
 	set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
 	set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
 	set(CPACK_PACKAGE_FILE_NAME "InspIRCd-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
-	set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/../docs/COPYING")
+	set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/../docs/LICENSE.txt")
 
 	set(CPACK_GENERATOR "NSIS")
 	set(CPACK_PACKAGE_INSTALL_DIRECTORY "InspIRCd")
@@ -103,7 +111,7 @@ if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
 	set(CPACK_NSIS_MUI_ICON "${INSPIRCD_BASE}/win\\\\inspircd.ico")
 	set(CPACK_NSIS_MUI_UNIICON "${INSPIRCD_BASE}/win\\\\inspircd.ico")
 	set(CPACK_NSIS_INSTALLED_ICON_NAME "inspircd.exe")
-	set(CPACK_NSIS_URL_INFO_ABOUT "http://www.inspircd.org/")
+	set(CPACK_NSIS_URL_INFO_ABOUT "https://www.inspircd.org")
 	set(CPACK_NSIS_COMPRESSOR "/SOLID zlib")
 
 	include(CPack)