Using the system-wide boost instead of the one supplied by common (…

…satya-das#23).

Excluded `src/catch` from git (an old version is downloaded by the main CMakeLists.txt). Note that `Catch2 v3` is out, and we are going to have to refactor the codes and use the new release soon.

.gitignore

@@ -13,6 +13,8 @@ y.output
 parser.lex.cpp
 parser.tab.*
 
+src/catch
+
 # Build results
 cmake-build-*
 .idea

CMakeLists.txt

@@ -4,8 +4,6 @@ project(cppparser)
 
 enable_testing()
 
-include("../common/cmake/conf.cmake")
-
 set(CMAKE_CXX_STANDARD 17)
 
 if(MSVC)
@@ -16,10 +14,14 @@ endif()
 add_subdirectory(third_party/btyacc_tp)
 
 add_definitions(-DBOOST_AUTO_LINK_NOMANGLE)
+set(Boost_USE_STATIC_LIBS OFF)
+set(Boost_USE_MULTITHREADED ON)
+set(Boost_USE_STATIC_RUNTIME OFF)
+find_package(Boost COMPONENTS filesystem program_options REQUIRED)
 
-add_subdirectory(../common/third_party/boost_tp/cmake  ${CMAKE_BINARY_DIR}/boost)
-
-include_directories(../common/third_party)
+if (NOT EXISTS "${CMAKE_SOURCE_DIR}/src/catch/catch.hpp")
+  file(DOWNLOAD "https://github.com/catchorg/Catch2/releases/download/v2.13.10/catch.hpp" "${CMAKE_SOURCE_DIR}/src/catch/catch.hpp")
+endif()
 
 #############################################
 ## CppParser
@@ -72,18 +74,17 @@ set(CPPPARSER_SOURCES
 )
 
 add_library(cppparser STATIC ${CPPPARSER_SOURCES})
-add_dependencies(cppparser btyacc boost_filesystem boost_program_options)
+add_dependencies(cppparser btyacc)
 target_link_libraries(cppparser
 	PUBLIC
-		boost_filesystem
-		boost_program_options
+		${Boost_FILESYSTEM_LIBRARY}
+		${Boost_PROGRAM_OPTIONS_LIBRARY}
 		boost_system
 )
 target_include_directories(
 	cppparser
 	PUBLIC
 		pub
-		../common/third_party/boost_tp
 	PRIVATE
 		hack
 )

test/app/compare.h

@@ -25,6 +25,9 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <iostream>
 #include <sstream>
+#include<fstream>
+#include<string>
+#include<iterator>
 
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>

third_party/btyacc_tp/CMakeLists.txt

@@ -1,5 +1,3 @@
-include("../../../common/cmake/conf.cmake")
-
 project(btyacc)
 
 if(${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")