From 48c470b72cf32c49dc146f5859d67708759997b2 Mon Sep 17 00:00:00 2001 From: Renaud G Date: Thu, 11 Jul 2019 22:57:21 +0200 Subject: rework diceparser to run unit tests --- CMakeLists.txt | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 3 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 9460032..d662262 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,12 +1,67 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.5) project(diceparser) +set(QT_REQUIRED_VERSION "5.9.0") +find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Core Test Gui Svg) #add_subdirectory(irc) -add_subdirectory(cli) #add_subdirectory(mobile) #add_subdirectory(webserver) -#qt5_use_modules() +# Add cmake extension +#find_package(ECM 5.33.0 CONFIG REQUIRED) +#set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) +#include(ECMAddTests) +enable_testing(true) +include_directories(${CMAKE_CURRENT_SOURCE_DIR} result node) + +SET( dice_sources + diceparser.cpp + range.cpp + booleancondition.cpp + validator.cpp + compositevalidator.cpp + operationcondition.cpp + die.cpp + parsingtoolbox.cpp + dicealias.cpp + result/result.cpp + result/scalarresult.cpp + result/stringresult.cpp + result/diceresult.cpp + node/countexecutenode.cpp + node/dicerollernode.cpp + node/executionnode.cpp + node/explodedicenode.cpp + node/helpnode.cpp + node/mergenode.cpp + node/jumpbackwardnode.cpp + node/keepdiceexecnode.cpp + node/listaliasnode.cpp + node/listsetrollnode.cpp + node/numbernode.cpp + node/parenthesesnode.cpp + # node/forloopnode.cpp + node/paintnode.cpp + node/rerolldicenode.cpp + node/scalaroperatornode.cpp + node/sortresult.cpp + node/startingnode.cpp + node/filternode.cpp + node/stringnode.cpp + node/ifnode.cpp + node/splitnode.cpp + node/groupnode.cpp + node/bind.cpp + node/occurencecountnode.cpp + node/uniquenode.cpp + highlightdice.cpp + node/variablenode.cpp +) +add_library(diceparser SHARED ${dice_sources} ) +target_link_libraries(diceparser PUBLIC Qt5::Core Qt5::Gui Qt5::Svg) + +add_subdirectory(cli) +add_subdirectory( tests ) -- cgit v1.2.3-70-g09d2