diff options
| author | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-02-03 21:02:20 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@montyprogram.com> | 2011-02-03 21:02:20 +0100 |
| commit | 074dc9a550e110810bb62fb4c709811d29cd0c91 (patch) | |
| tree | 3a9bc5e8b1fed69bf1a4fe82a1cfe7a7f4f2914e | |
| parent | d99fbf4867db99b79385565f2b8ac9f164462240 (diff) | |
| download | mariadb-git-074dc9a550e110810bb62fb4c709811d29cd0c91.tar.gz | |
On Philips request, introduce a variable
BUILD_RELEASE to disable graceful fallbacks
if WiX or MFC is not available.
| -rwxr-xr-x | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | win/packaging/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | win/upgrade_wizard/CMakeLists.txt | 7 |
3 files changed, 14 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f00b53b9abb..1a248e0a1b8 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,9 @@ IF(WIN32) # This reads user configuration, generated by configure.js. INCLUDE(win/configure.data OPTIONAL) ENDIF() - +IF(BUILD_RELEASE) + MESSAGE("Building release package") +ENDIF() CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in diff --git a/win/packaging/CMakeLists.txt b/win/packaging/CMakeLists.txt index c0670a171ba..8ba436a518e 100644 --- a/win/packaging/CMakeLists.txt +++ b/win/packaging/CMakeLists.txt @@ -40,6 +40,11 @@ IF(NOT WIX_DIR) IF(NOT _WIX_DIR_CHECKED) SET(_WIX_DIR_CHECKED 1 CACHE INTERNAL "") MESSAGE(STATUS "Cannot find wix 3, installer project will not be generated") + IF(BUILD_RELEASE) + MESSAGE(FATAL_ERROR + "Can't find Wix. It is necessary for producing official package" + ) + ENDIF() ENDIF() RETURN() ENDIF() diff --git a/win/upgrade_wizard/CMakeLists.txt b/win/upgrade_wizard/CMakeLists.txt index fad67a207de..2e15087de43 100644 --- a/win/upgrade_wizard/CMakeLists.txt +++ b/win/upgrade_wizard/CMakeLists.txt @@ -9,8 +9,13 @@ ENDIF() # We need MFC FIND_PACKAGE(MFC) IF(NOT MFC_FOUND) + IF(BUILD_RELEASE) + MESSAGE(FATAL_ERROR + "Can't find MFC. It is necessary for producing official package" + ) + ENDIF() RETURN() -ENDIF() +ENDIF() # MFC should be statically linked SET(CMAKE_MFC_FLAG 1) |