From 25e4156940a5a6a8acba469b538c8c3c9bc81e7a Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Wed, 14 Nov 2018 10:01:12 +0100 Subject: [PATCH] enable niftest by default, coverity branch covers everything but openmw now due to timeouts; we run coverity manually for openmw for now; re-order options to be readable and logical sequence --- .travis.yml | 2 +- CMakeLists.txt | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 660337cdf..8c44cb60b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ addons: description: "" branch_pattern: coverity_scan notification_email: 720642+scrawl@users.noreply.github.com - build_command_prepend: "cov-configure --comptype gcc --compiler gcc-5 --template; cmake . -DBUILD_OPENCS=FALSE -DBUILD_WIZARD=FALSE -DBUILD_UNITTESTS=FALSE -DBUILD_BSATOOL=FALSE -DBUILD_ESMTOOL=FALSE -DBUILD_MWINIIMPORTER=FALSE -DBUILD_ESSIMPORTER=FALSE -DBUILD_LAUNCHER=FALSE -DBUILD_MYGUI_PLUGIN=FALSE" + build_command_prepend: "cov-configure --comptype gcc --compiler gcc-5 --template; cmake . -DBUILD_OPENMW=FALSE" build_command: "make VERBOSE=1 -j3" matrix: include: diff --git a/CMakeLists.txt b/CMakeLists.txt index 606d27bfd..28dd70973 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,17 +1,17 @@ # Apps and tools -option(BUILD_OPENMW "build OpenMW" ON) -option(BUILD_BSATOOL "build BSA extractor" ON) -option(BUILD_ESMTOOL "build ESM inspector" ON) -option(BUILD_LAUNCHER "build Launcher" ON) -option(BUILD_MWINIIMPORTER "build MWiniImporter" ON) -option(BUILD_ESSIMPORTER "build ESS (Morrowind save game) importer" ON) -option(BUILD_OPENCS "build OpenMW Construction Set" ON) -option(BUILD_WIZARD "build Installation Wizard" ON) +option(BUILD_OPENMW "Build OpenMW" ON) +option(BUILD_LAUNCHER "Build Launcher" ON) +option(BUILD_WIZARD "Build Installation Wizard" ON) +option(BUILD_MWINIIMPORTER "Build MWiniImporter" ON) +option(BUILD_OPENCS "Build OpenMW Construction Set" ON) +option(BUILD_ESSIMPORTER "Build ESS (Morrowind save game) importer" ON) +option(BUILD_BSATOOL "Build BSA extractor" ON) +option(BUILD_ESMTOOL "Build ESM inspector" ON) +option(BUILD_NIFTEST "Build nif file tester" ON) +option(BUILD_MYGUI_PLUGIN "Build MyGUI plugin for OpenMW resources, to use with MyGUI tools" ON) +option(BUILD_DOCS "Build documentation." OFF ) option(BUILD_WITH_CODE_COVERAGE "Enable code coverage with gconv" OFF) -option(BUILD_UNITTESTS "Enable Unittests with Google C++ Unittest" OFF) -option(BUILD_NIFTEST "build nif file tester" OFF) -option(BUILD_MYGUI_PLUGIN "build MyGUI plugin for OpenMW resources, to use with MyGUI tools" ON) -option(BUILD_DOCS "build documentation." OFF ) +option(BUILD_UNITTESTS "Enable Unittests with Google C++ Unittest" OFF) if (NOT BUILD_LAUNCHER AND NOT BUILD_OPENCS AND NOT BUILD_WIZARD) set(USE_QT FALSE)