From 9c89d57ff0953dff143effaf391836a73df3496a Mon Sep 17 00:00:00 2001 From: Bruno Van de Velde Date: Mon, 4 Feb 2019 18:59:37 +0100 Subject: [PATCH] Build the gui builder by default --- .appveyor.yml | 2 +- CMakeLists.txt | 2 +- changelog.txt | 4 ++-- tests/travis_linux_tests.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index d7c27b0c..e32de95c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -111,7 +111,7 @@ build_script: - IF NOT "%SFML_PATH%" == "C:\SFML" ( mkdir %BUILD_FOLDER% && cd %BUILD_FOLDER% && - cmake -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DTGUI_SHARED_LIBS=%SHARED_LIBS% -DTGUI_BUILD_TESTS=%BUILD_TESTS% -DTGUI_BUILD_EXAMPLES=%BUILD_EXAMPLES% -DTGUI_OPTIMIZE_SINGLE_BUILD=%FAST_BUILD% -DSFML_DIR=%SFML_PATH%\lib\cmake\SFML .. && + cmake -G "%GENERATOR%" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DTGUI_SHARED_LIBS=%SHARED_LIBS% -DTGUI_BUILD_TESTS=%BUILD_TESTS% -DTGUI_BUILD_EXAMPLES=%BUILD_EXAMPLES% -DTGUI_BUILD_GUI_BUILDER=FALSE -DTGUI_OPTIMIZE_SINGLE_BUILD=%FAST_BUILD% -DSFML_DIR=%SFML_PATH%\lib\cmake\SFML .. && msbuild tgui.sln /p:Configuration=%BUILD_TYPE% /m && cd .. && IF "%BUILD_TESTS%"=="TRUE" ( diff --git a/CMakeLists.txt b/CMakeLists.txt index 91c6cdd0..af3574d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,7 +49,7 @@ else() endif() tgui_set_option(TGUI_BUILD_TESTS FALSE BOOL "TRUE to build the TGUI tests") -tgui_set_option(TGUI_BUILD_GUI_BUILDER FALSE BOOL "TRUE to compile the GUI Builder") +tgui_set_option(TGUI_BUILD_GUI_BUILDER TRUE BOOL "TRUE to compile the GUI Builder") tgui_set_option(TGUI_BUILD_DOC FALSE BOOL "TRUE to generate the API documentation, FALSE to ignore it") # Define the install directory for miscellaneous files diff --git a/changelog.txt b/changelog.txt index 8cfa11fd..f219d85c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,5 @@ -TGUI 0.8.3 (TBD) ------------------ +TGUI 0.8.3 (27 January 2019) +----------------------------- - ListView widget added - EditBox can now have a suffix diff --git a/tests/travis_linux_tests.sh b/tests/travis_linux_tests.sh index a3414b8a..880d11f4 100644 --- a/tests/travis_linux_tests.sh +++ b/tests/travis_linux_tests.sh @@ -23,7 +23,7 @@ fi mkdir $BUILD_FOLDER cd $BUILD_FOLDER -CXXFLAGS="-fprofile-arcs -ftest-coverage -DTGUI_SKIP_DRAW_TESTS -DTGUI_REMOVE_DEPRECATED_CODE" cmake -DCMAKE_BUILD_TYPE=Debug -DTGUI_BUILD_TESTS=TRUE -DTGUI_OPTIMIZE_TESTS_SINGLE_BUILD=TRUE -DTGUI_OPTIMIZE_SINGLE_BUILD_THREADS=2 .. +CXXFLAGS="-fprofile-arcs -ftest-coverage -DTGUI_SKIP_DRAW_TESTS -DTGUI_REMOVE_DEPRECATED_CODE" cmake -DCMAKE_BUILD_TYPE=Debug -DTGUI_BUILD_GUI_BUILDER=FALSE -DTGUI_BUILD_TESTS=TRUE -DTGUI_OPTIMIZE_TESTS_SINGLE_BUILD=TRUE -DTGUI_OPTIMIZE_SINGLE_BUILD_THREADS=2 .. make -j2 cd tests/ ./tests