Commit 074dc9a5 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

On Philips request, introduce a variable

BUILD_RELEASE to disable graceful fallbacks
if WiX or MFC is not available.
parent d99fbf48
...@@ -44,7 +44,9 @@ IF(WIN32) ...@@ -44,7 +44,9 @@ IF(WIN32)
# This reads user configuration, generated by configure.js. # This reads user configuration, generated by configure.js.
INCLUDE(win/configure.data OPTIONAL) INCLUDE(win/configure.data OPTIONAL)
ENDIF() ENDIF()
IF(BUILD_RELEASE)
MESSAGE("Building release package")
ENDIF()
CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/include/mysql_version.h.in
......
...@@ -40,6 +40,11 @@ IF(NOT WIX_DIR) ...@@ -40,6 +40,11 @@ IF(NOT WIX_DIR)
IF(NOT _WIX_DIR_CHECKED) IF(NOT _WIX_DIR_CHECKED)
SET(_WIX_DIR_CHECKED 1 CACHE INTERNAL "") SET(_WIX_DIR_CHECKED 1 CACHE INTERNAL "")
MESSAGE(STATUS "Cannot find wix 3, installer project will not be generated") 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() ENDIF()
RETURN() RETURN()
ENDIF() ENDIF()
......
...@@ -9,8 +9,13 @@ ENDIF() ...@@ -9,8 +9,13 @@ ENDIF()
# We need MFC # We need MFC
FIND_PACKAGE(MFC) FIND_PACKAGE(MFC)
IF(NOT MFC_FOUND) IF(NOT MFC_FOUND)
IF(BUILD_RELEASE)
MESSAGE(FATAL_ERROR
"Can't find MFC. It is necessary for producing official package"
)
ENDIF()
RETURN() RETURN()
ENDIF() ENDIF()
# MFC should be statically linked # MFC should be statically linked
SET(CMAKE_MFC_FLAG 1) SET(CMAKE_MFC_FLAG 1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment