1 files changed, 7 insertions, 135 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4d0536..7c538e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,145 +2,17 @@ cmake_minimum_required(VERSION 3.16)
 
 project(diceparser VERSION 1.9.0 DESCRIPTION "Parser of dice command")
 
-set(QT_REQUIRED_VERSION "6.3.0")
-set(QT_VERSION_MAJOR "6")
-find_package(Qt${QT_VERSION_MAJOR} ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Core Test Gui Svg)
-find_package(Qt${QT_VERSION_MAJOR} ${QT_REQUIRED_VERSION} CONFIG COMPONENTS Qml Concurrent)
-
-enable_testing(true)
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} result node)
 
 option(BUILD_CLI OFF)
+option(TESTS OFF)
+option(NO_PAINTER_OPERATOR OFF)
 
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-
-set(dice_header_path include/diceparser)
-
-set(dice_public_headers ${dice_header_path}/diceparser_global.h
-${dice_header_path}/dicealias.h
-${dice_header_path}/diceparser.h
-${dice_header_path}/diceparserhelper.h
-${dice_header_path}/highlightdice.h
-${dice_header_path}/parsingtoolbox.h # should no be public…
-)
-
-
-SET( dice_sources
-    ${CMAKE_CURRENT_SOURCE_DIR}/diceparser.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/range.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/booleancondition.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/validator.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/validatorlist.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/operationcondition.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/die.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/parsingtoolbox.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/dicealias.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/result/result.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/result/scalarresult.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/result/stringresult.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/result/diceresult.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/countexecutenode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/dicerollernode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/executionnode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/explodedicenode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/helpnode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/allsamenode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/mergenode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/jumpbackwardnode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/keepdiceexecnode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/listaliasnode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/listsetrollnode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/numbernode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/parenthesesnode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/paintnode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/rerolldicenode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/scalaroperatornode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/sortresult.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/startingnode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/filternode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/stringnode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/ifnode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/splitnode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/groupnode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/bind.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/occurencecountnode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/uniquenode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/highlightdice.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/variablenode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/valueslistnode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/repeaternode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/switchcasenode.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/node/replacevaluenode.cpp
-)
-
-IF(STATIC_BUILD)
-    add_library(diceparser_static STATIC ${dice_sources} )
-    target_include_directories(diceparser_static PRIVATE include)
-    target_link_libraries(diceparser_static PUBLIC Qt6::Core Qt6::Gui Qt6::Svg)
-    install(TARGETS diceparser_static
-        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
-endif()
-
-set(documentation README.md HelpMe.md CHANGELOG)
-
-add_library(diceparser_shared SHARED ${dice_sources} ${documentation} ${dice_public_headers})
-set_target_properties(diceparser_shared PROPERTIES PUBLIC_HEADER "${public_header_widget}")
-target_compile_definitions(diceparser_shared PRIVATE DICEPARSER_LIBRARY)
-
-target_include_directories(diceparser_shared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
-    PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-
-SET_TARGET_PROPERTIES(diceparser_shared PROPERTIES OUTPUT_NAME diceparser CLEAN_DIRECT_OUTPUT 1)
-target_link_libraries(diceparser_shared PUBLIC Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Svg)
-
-set_target_properties(diceparser_shared PROPERTIES VERSION ${PROJECT_VERSION})
-set_target_properties(diceparser_shared PROPERTIES SOVERSION 1)
-
-IF(BUILD_CLI)
-    add_subdirectory(cli)
+IF(TESTS)
+  enable_testing()
 ENDIF()
 
-if(TESTS)
-add_subdirectory( tests )
-endif()
-
-include(GNUInstallDirs)
-
-
-configure_file(diceparser.pc.in diceparser.pc @ONLY)
-
-install(TARGETS diceparser_shared
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/diceparser.pc DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pkgconfig)
-
-if(Qt${QT_VERSION_MAJOR}Qml_FOUND)
-    set(dice_header_qobject include/diceparser_qobject/diceparser_qobject_global.h include/diceparser_qobject/qmltypesregister.h include/diceparser_qobject/diceroller.h)
-    set(dice_source_qobject qmltypesregister.cpp diceroller.cpp)
-    set(CMAKE_AUTOMOC ON)
-    set(CMAKE_AUTOUIC ON)
-    set(CMAKE_AUTORCC ON)
-    set(CMAKE_INCLUDE_CURRENT_DIR ON)
-    add_library(diceparser_qobject SHARED ${dice_header_qobject} ${dice_source_qobject})
-    set_target_properties(diceparser_qobject PROPERTIES PUBLIC_HEADER "${dice_header_qobject}")
-    target_compile_definitions(diceparser_qobject PRIVATE DICEPARSER_QOBJECT_LIBRARY)
-    target_link_libraries(diceparser_qobject PUBLIC Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Svg Qt${QT_VERSION_MAJOR}::Qml Qt${QT_VERSION_MAJOR}::Concurrent PRIVATE diceparser_shared)
-    message("Messages diceparser ${CMAKE_CURRENT_SOURCE_DIR}/include")
-
-    target_include_directories(diceparser_qobject PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}
-        PUBLIC
-            $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-            $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
-
-
-    install(TARGETS   diceparser_qobject
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
-endif()
-
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 
+add_subdirectory(src)