Merge branch 'master' of github.com:obiwankennedy/DiceParser

Conflicts:
	parsingtoolbox.cpp

1 files changed, 71 insertions, 0 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..577e112
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,71 @@
+cmake_minimum_required(VERSION 2.8)
+
+
+project(dice)
+
+#/net/rnd/src/qt/qt-everywhere-enterprise-src-5.3.0/linux-x86_64-gcc-4.7.2/lib/cmake
+set(CMAKE_PREFIX_PATH "/net/rnd/src/qt/qt-everywhere-enterprise-src-5.3.0/linux-x86_64-gcc-4.7.2/lib/cmake")
+
+#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}
+#${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+
+
+# Find includes in corresponding build directories
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+# Instruct CMake to run moc automatically when needed.
+set(CMAKE_AUTOMOC ON)
+
+# Find the QtWidgets library
+find_package(Qt5Core)
+
+set(EXECUTABLE_OUTPUT_PATH bin/)
+
+include_directories(${Qt5Core_INCLUDES})
+add_definitions(${Qt5Core_DEFINITIONS})
+
+set(MODE "cli")
+#file ( 
+#        GLOB_RECURSE
+#        source_files
+#        *.cpp
+#        result/*
+#        node/*
+#)
+add_executable(
+    dice     
+    diceparser.cpp 
+    range.cpp 
+    booleancondition.cpp 
+    validator.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/explosedicenode.cpp
+node/helpnode.cpp
+node/jumpbackwardnode.cpp
+node/keepdiceexecnode.cpp
+node/listaliasnode.cpp
+node/listsetrollnode.cpp
+node/numbernode.cpp
+node/parenthesesnode.cpp
+node/rerolldicenode.cpp
+node/scalaroperatornode.cpp
+node/sortresult.cpp
+node/startingnode.cpp
+cli/main.cpp
+    )
+
+#add_executable(dice cli/main.cpp)
+
+
+target_link_libraries(dice ${Qt5Core_LIBRARIES})
+
+#qt5_use_modules()
+