Add BARRIER_BUILD_TESTS CMake option to make tests optional
This commit is contained in:
parent
d186548a53
commit
4a031b8ce5
|
@ -20,6 +20,7 @@ project (barrier C CXX)
|
||||||
|
|
||||||
option (BARRIER_BUILD_GUI "Build the GUI" ON)
|
option (BARRIER_BUILD_GUI "Build the GUI" ON)
|
||||||
option (BARRIER_BUILD_INSTALLER "Build the installer" ON)
|
option (BARRIER_BUILD_INSTALLER "Build the installer" ON)
|
||||||
|
option (BARRIER_BUILD_TESTS "Build the tests" ON)
|
||||||
|
|
||||||
set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
set (CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
||||||
set (CMAKE_CXX_STANDARD 14)
|
set (CMAKE_CXX_STANDARD 14)
|
||||||
|
@ -49,7 +50,6 @@ else()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
set (libs)
|
set (libs)
|
||||||
include_directories (BEFORE SYSTEM ./ext/gtest/include)
|
|
||||||
|
|
||||||
if (UNIX)
|
if (UNIX)
|
||||||
if (NOT APPLE)
|
if (NOT APPLE)
|
||||||
|
|
|
@ -19,7 +19,10 @@ include_directories (${CMAKE_CURRENT_BINARY_DIR}/lib)
|
||||||
|
|
||||||
add_subdirectory(lib)
|
add_subdirectory(lib)
|
||||||
add_subdirectory(cmd)
|
add_subdirectory(cmd)
|
||||||
add_subdirectory(test)
|
|
||||||
|
if (BARRIER_BUILD_TESTS)
|
||||||
|
add_subdirectory(test)
|
||||||
|
endif()
|
||||||
|
|
||||||
if (BARRIER_BUILD_GUI)
|
if (BARRIER_BUILD_GUI)
|
||||||
add_subdirectory(gui)
|
add_subdirectory(gui)
|
||||||
|
|
|
@ -24,7 +24,9 @@
|
||||||
#include "common/stdset.h"
|
#include "common/stdset.h"
|
||||||
#include "common/stdvector.h"
|
#include "common/stdvector.h"
|
||||||
|
|
||||||
|
#ifdef TEST_ENV
|
||||||
#include <gtest/gtest_prod.h>
|
#include <gtest/gtest_prod.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace barrier {
|
namespace barrier {
|
||||||
|
|
||||||
|
@ -327,6 +329,7 @@ public:
|
||||||
//@}
|
//@}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
#ifdef TEST_ENV
|
||||||
FRIEND_TEST(KeyMapTests,
|
FRIEND_TEST(KeyMapTests,
|
||||||
findBestKey_requiredDown_matchExactFirstItem);
|
findBestKey_requiredDown_matchExactFirstItem);
|
||||||
FRIEND_TEST(KeyMapTests,
|
FRIEND_TEST(KeyMapTests,
|
||||||
|
@ -340,6 +343,7 @@ private:
|
||||||
FRIEND_TEST(KeyMapTests,
|
FRIEND_TEST(KeyMapTests,
|
||||||
findBestKey_onlyOneRequiredDown_matchTwoRequiredChangesItem);
|
findBestKey_onlyOneRequiredDown_matchTwoRequiredChangesItem);
|
||||||
FRIEND_TEST(KeyMapTests, findBestKey_noRequiredDown_cannotMatch);
|
FRIEND_TEST(KeyMapTests, findBestKey_noRequiredDown_cannotMatch);
|
||||||
|
#endif
|
||||||
|
|
||||||
private:
|
private:
|
||||||
//! Ways to synthesize a key
|
//! Ways to synthesize a key
|
||||||
|
|
|
@ -15,6 +15,8 @@
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#define TEST_ENV
|
||||||
|
|
||||||
#include "barrier/KeyMap.h"
|
#include "barrier/KeyMap.h"
|
||||||
|
|
||||||
#include "test/global/gtest.h"
|
#include "test/global/gtest.h"
|
||||||
|
|
Loading…
Reference in New Issue