Merge pull request #14 from tsengia/facelift

Facelift

Author: tsengia

Diff for: .gitignore

@@ -39,3 +39,5 @@
 # Documentaion
 docs/*
 doc/*
+
+build/

Diff for: .vscode/settings.json

@@ -0,0 +1,61 @@
+{
+    "C_Cpp.default.cppStandard": "c++11",
+    "C_Cpp.default.includePath": [
+        "${workspaceFolder}/include"
+    ],
+    "files.associations": {
+        "iostream": "cpp",
+        "string": "cpp",
+        "array": "cpp",
+        "atomic": "cpp",
+        "bit": "cpp",
+        "*.tcc": "cpp",
+        "bitset": "cpp",
+        "cctype": "cpp",
+        "chrono": "cpp",
+        "clocale": "cpp",
+        "cmath": "cpp",
+        "condition_variable": "cpp",
+        "cstdarg": "cpp",
+        "cstddef": "cpp",
+        "cstdint": "cpp",
+        "cstdio": "cpp",
+        "cstdlib": "cpp",
+        "cstring": "cpp",
+        "ctime": "cpp",
+        "cwchar": "cpp",
+        "cwctype": "cpp",
+        "deque": "cpp",
+        "map": "cpp",
+        "unordered_map": "cpp",
+        "vector": "cpp",
+        "exception": "cpp",
+        "algorithm": "cpp",
+        "functional": "cpp",
+        "iterator": "cpp",
+        "memory": "cpp",
+        "memory_resource": "cpp",
+        "numeric": "cpp",
+        "optional": "cpp",
+        "random": "cpp",
+        "ratio": "cpp",
+        "regex": "cpp",
+        "string_view": "cpp",
+        "system_error": "cpp",
+        "tuple": "cpp",
+        "type_traits": "cpp",
+        "utility": "cpp",
+        "fstream": "cpp",
+        "initializer_list": "cpp",
+        "iosfwd": "cpp",
+        "istream": "cpp",
+        "limits": "cpp",
+        "new": "cpp",
+        "ostream": "cpp",
+        "shared_mutex": "cpp",
+        "sstream": "cpp",
+        "stdexcept": "cpp",
+        "streambuf": "cpp",
+        "typeinfo": "cpp"
+    }
+}

Diff for: CMakeLists.txt

@@ -1,40 +1,47 @@
 cmake_minimum_required(VERSION 3.0)
 
 project(jsgfkitxx
-	VERSION 1.0
-	LANGUAGES CXX)
+	VERSION 1.1
+	LANGUAGES CXX
+)
+
+set(JSGF_KIT_XX_SOURCES 
+    src/Grammar.cpp
+    src/Expansion.cpp 
+    src/Rule.cpp 
+    src/MatchInfo.cpp 
+    src/MatchResult.cpp 
+    src/Tag.cpp                
+    src/UnparsedSection.cpp 
+    src/KleeneStar.cpp 
+    src/PlusOperator.cpp            
+    src/OptionalGrouping.cpp 
+    src/RequiredGrouping.cpp 
+    src/Sequence.cpp     
+    src/AlternativeSet.cpp 
+    src/Token.cpp 
+    src/RuleReference.cpp
+)
+
+add_library(jsgfkitxx STATIC ${JSGF_KIT_XX_SOURCES})
+target_include_directories(jsgfkitxx PUBLIC ${PROJECT_SOURCE_DIR}/include)
 
 include(GNUInstallDirs)
 
-option(ENABLE_DEBUG "Enables debugging messages" OFF)
-
-set(KIT_SOURCES src/grammar.cpp src/expansion.cpp src/rule.cpp src/matchinfo.cpp src/matchresult.cpp src/matchtracker.cpp src/tag.cpp
-                        src/unparsedsection.cpp src/kleenestar.cpp src/plusoperator.cpp
-                        src/optionalgrouping.cpp src/requiredgrouping.cpp src/sequence.cpp
-                        src/alternativeset.cpp src/token.cpp src/rulereference.cpp)
-
-set(KIT_HEADERS include/rule.h include/expansion.h include/grammar.h
-                  include/unparsedsection.h include/kleenestar.h
-                  include/alternativeset.h include/token.h include/tag.h include/matchinfo.h include/matchtracker.h
-                  include/matchresult.h include/sequence.h include/plusoperator.h include/requiredgrouping.h
-                  include/optionalgrouping.h include/rulereference.h)
-
-add_library(jsgfkit STATIC ${KIT_SOURCES})
-target_include_directories(jsgfkit PUBLIC ${PROJECT_BINARY_DIR}/include)
-
 #Set variables for the .pc file
 set(prefix "${CMAKE_INSTALL_PREFIX}")
 set(exec_prefix "${CMAKE_INSTALL_PREFIX}")
 set(libdir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
 set(includedir "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
-configure_file(jsgfkit.pc.in jsgfkit.pc @ONLY)
+configure_file(jsgfkitxx.pc.in jsgfkitxx.pc @ONLY)
 
-install(TARGETS jsgfkit
-	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+install(TARGETS jsgfkitxx
+	ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
 
-install(FILES ${KIT_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jsgfkit)
+install(FILES ${KIT_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/jsgfkitxx)
 
-install(FILES jsgfkit.pc DESTINATION ${CMAKE_INSTALL_DATAROOT_DIR}/pkgconfig)
+install(FILES jsgfkitxx.pc DESTINATION ${CMAKE_INSTALL_DATAROOT_DIR}/pkgconfig)
 
 # Build Tests
 enable_testing ()