From 5373729572af5f13f664b819c8dd479f19de801f Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 25 Apr 2019 09:49:00 -0400 Subject: [PATCH] Changes: prep for release --- CHANGES | 2 +- CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 4710393f5..daeda581a 100644 --- a/CHANGES +++ b/CHANGES @@ -12,7 +12,7 @@ This release contains contributions from (alphabetically by first name): ## Modules ## -# 3.2.6 (unreleased) # +# 3.2.6 (2019-04-25) # This release contains contributions from (alphabetically by first name): - Arnaud Ferraris diff --git a/CMakeLists.txt b/CMakeLists.txt index ce627fc9b..eea2a27cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -40,7 +40,7 @@ project( CALAMARES VERSION 3.2.6 LANGUAGES C CXX ) -set( CALAMARES_VERSION_RC 1 ) # Set to 0 during release cycle, 1 during development +set( CALAMARES_VERSION_RC 0 ) # Set to 0 during release cycle, 1 during development ### OPTIONS # @@ -208,7 +208,7 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) set( CMAKE_TOOLCHAIN_PREFIX "llvm-" ) set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" ) - + set( CALAMARES_AUTOMOC_OPTIONS "-butils/moc-warnings.h" ) else() set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" )