(From Helge:) Removed BlueFramework_DIR_OVERRIDE. Improved deployment

pjanck · Mar 8, 2018 · 157fdb8 · 157fdb8
1 parent 03e1ce2
commit 157fdb8
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 10 deletions.
diff --git a/.hgignore b/.hgignore
@@ -4,4 +4,5 @@ make.bat
 Tools/updateVersion.pyo
 build/*
 external/log_install_*
-BlueFrameworkConfig.cmake
+BlueFrameworkConfig.cmake
+BlueFrameworkConfigVersion.cmake
diff --git a/CMake/FindBlueFramework.cmake b/CMake/FindBlueFramework.cmake
@@ -49,10 +49,6 @@ else(BlueFramework_FIND_COMPONENTS)
 endif(BlueFramework_FIND_COMPONENTS)
 
 if(BlueFramework_DIR)
-	find_path(BlueFramework_DIR_OVERRIDE OPTIONAL)
-	if(BlueFramework_DIR_OVERRIDE)
-		set(BlueFramework_DIR ${BlueFramework_DIR_OVERRIDE})
-	endif()
 	include(${BlueFramework_DIR}/CMake/BlueFrameworkMacros.cmake)
 	set(BLUEFRAMEWORK_INCLUDE_DIR ${BLUEFRAMEWORK_INCLUDE_DIR} ${BlueFramework_DIR}/include/)
 	set(BLUEFRAMEWORK_LIBRARY_DIR ${BlueFramework_DIR}/lib/${MSVC_VERSION_STRING}/${CMAKE_VS_PLATFORM_NAME}/)

diff --git a/CMake/ProjectVersion.cmake b/CMake/ProjectVersion.cmake
@@ -1,4 +1,4 @@
-set(PROJECT_VERSION_TWEAK "81")
+set(PROJECT_VERSION_TWEAK "82")
 set(PROJECT_VERSION_PATCH "1")
 set(PROJECT_VERSION_MINOR "1")
 set(PROJECT_VERSION_MAJOR "3")
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -315,11 +315,12 @@ install(DIRECTORY include/ DESTINATION include
 )
 file(GLOB BLUEFRAMEWORK_CONFIG ${PROJECT_SOURCE_DIR}/CMake/FindBlueFramework.cmake)
 file(GLOB BLUEFRAMEWORK_MACROS ${PROJECT_SOURCE_DIR}/CMake/BlueFrameworkMacros.cmake)
-file(WRITE ${CMAKE_BINARY_DIR}/BlueFramework-config-version.cmake "set(PACKAGE_VERSION \"${CPACK_PACKAGE_VERSION}\") \nset(PACKAGE_VERSION_EXACT True) \nset(PACKAGE_VERSION_COMPATIBLE True) \nset(PACKAGE_VERSION_UNSUITABLE False)")
+file(WRITE ${CMAKE_BINARY_DIR}/BlueFrameworkConfigVersion.cmake "set(PACKAGE_VERSION \"${CPACK_PACKAGE_VERSION}\") \nset(PACKAGE_VERSION_EXACT True) \nset(PACKAGE_VERSION_COMPATIBLE True) \nset(PACKAGE_VERSION_UNSUITABLE False)")
 file(COPY ${BLUEFRAMEWORK_CONFIG} DESTINATION ${PROJECT_SOURCE_DIR})
+file(COPY ${CMAKE_BINARY_DIR}/BlueFrameworkConfigVersion.cmake DESTINATION ${PROJECT_SOURCE_DIR})
 file(RENAME "FindBlueFramework.cmake" "BlueFrameworkConfig.cmake")
 install(FILES ${BLUEFRAMEWORK_CONFIG} DESTINATION / COMPONENT cmake RENAME "BlueFrameworkConfig.cmake")
 install(FILES ${BLUEFRAMEWORK_MACROS} DESTINATION CMake COMPONENT cmake)
-install(FILES ${CMAKE_BINARY_DIR}/BlueFramework-config-version.cmake DESTINATION / COMPONENT cmake)
+install(FILES ${CMAKE_BINARY_DIR}/BlueFrameworkConfigVersion.cmake DESTINATION / COMPONENT cmake)
 
 include(CPack)
diff --git a/Core/src/BlueFramework/Core/Version.h b/Core/src/BlueFramework/Core/Version.h
@@ -17,7 +17,7 @@
 #define BLUEFRAMEWORK_API_MAJOR 3
 #define BLUEFRAMEWORK_API_MINOR 1
 #define BLUEFRAMEWORK_API_PATCH 1
-#define BLUEFRAMEWORK_API_TWEAK 81
+#define BLUEFRAMEWORK_API_TWEAK 82
 
 BLUEFRAMEWORK_CORE_NAMESPACE_BEGIN
 

diff --git a/Docs/Deployment.md b/Docs/Deployment.md
@@ -1,6 +1,6 @@
 ## Deployment
 
-If you want to deploy the BlueFramework you have to build the “DEPLOY” project. This project requieres an installation of the Nullsoft Scriptable Install System (NSIS). Currently (at the time of writing this) we are using NSIS 3.0 which can be donwloaded [here](http://nsis.sourceforge.net/Main_Page).
+If you want to deploy the BlueFramework you have to build the “DEPLOY” project. This project requires an installation of the Windows Installer XML (WIX). Currently (at the time of writing this) we are using Windows Installer XML 3.11.1 which can be downloaded [here](http://wixtoolset.org/releases/).
 
 **Open Questions**