diff options
author | Daniel Fischer <df@sun.com> | 2010-04-30 13:30:32 +0200 |
---|---|---|
committer | Daniel Fischer <df@sun.com> | 2010-04-30 13:30:32 +0200 |
commit | 2b588155e484a7d203988f8144da6bc160e80a1d (patch) | |
tree | ee7a70c95713ef64613e86560036a23c52eb3eae /CMakeLists.txt | |
parent | 33b57ce2cd73377d3aac265eaedb420935da0668 (diff) | |
download | mariadb-git-2b588155e484a7d203988f8144da6bc160e80a1d.tar.gz |
Changes to MSI installer:
- Introduce MANUFACTURER setting to set package manufacturer via CMake.
- Introduce COMMUNITY_BUILD setting to be passed on to packaging
(not used here, but required for our own packages to determine what
added files should be included in the package).
- Create an RTF version of the COPYING text file and use that as the
default license (can be overridden by providing a COPYING.rtf file).
- Allow passing extra arguments to candle and light via environment.
(Need -sval in pushbuild, but want validation elsewhere.)
- Introduce a custom action that stops and uninstalls the service
if the user installed one that points into the MySQL directory
that is being removed.
(Our own packages historically used the instance configuration wizard
for this, but it wouldn't be very nice if MSIs created by our users
couldn't remove it too.)
- Make install location configurable again ("Browse" button in custom
installation was greyed out before).
- Remove registry keys that use "MySQL AB"; they should only be set in
packages provided by us. Users can set their own registry keys if
they want to.
Diffstat (limited to 'CMakeLists.txt')
-rwxr-xr-x | CMakeLists.txt | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8edd1e5c158..43c1c2ea095 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,6 +36,18 @@ SET(CUSTOM_C_FLAGS $ENV{CFLAGS}) OPTION(WITH_DEBUG "Use dbug/safemutex" OFF) OPTION(WITH_DEBUG_FULL "Use dbug and safemalloc/safemutex. Slow" OFF) +# Distinguish between community and non-community builds, with the +# default being a community build. This does not impact the feature +# set that will be compiled in; it's merely provided as a hint to +# custom packaging steps. +OPTION(COMMUNITY_BUILD "Set to true if this is a community build" ON) + +# Use a default manufacturer if no manufacturer was identified. +SET(MANUFACTURER_DOCSTRING + "Set the entity that appears as the manufacturer of packages that support a manufacturer field.") +IF(NOT DEFINED MANUFACTURER) + SET(MANUFACTURER "Built from Source" CACHE BOOL ${MANUFACTURER_DOCSTRING}) +ENDIF() # We choose to provide WITH_DEBUG as alias to standard CMAKE_BUILD_TYPE=Debug # which turns out to be not trivial, as this involves synchronization |