Back-ported DVCon turorial changes

CMakeLists.txt

@@ -1,8 +1,17 @@
 cmake_minimum_required(VERSION 3.3)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_CURRENT_SOURCE_DIR}/sc-components/cmake)
 
+set(ENABLE_SCV TRUE CACHE BOOL "Enable use of SCV")
+
 include(GitFunctions)
 get_branch_from_git()
+# if we are not on master or develop set the submodules to develop
+IF(NOT ${GIT_BRANCH} MATCHES "master") 
+	IF(NOT ${GIT_BRANCH} MATCHES "develop") 
+		message(STATUS "main branch is '${GIT_BRANCH}', setting submodules to 'develop'")
+		set(GIT_BRANCH develop)
+	endif()
+endif()
 
 ### set the directory names of the submodules
 set(GIT_SUBMODULES elfio libGIS sc-components dbt-core)
@@ -45,12 +54,58 @@ endif()
 
 setup_conan()
 
+# This line finds the boost lib and headers. 
+set(Boost_NO_BOOST_CMAKE ON) #  Don't do a find_package in config mode before searching for a regular boost install.
+find_package(Boost COMPONENTS program_options system thread filesystem REQUIRED)
+
+if(DEFINED ENV{LLVM_HOME})
+	find_path (LLVM_DIR LLVM-Config.cmake $ENV{LLVM_HOME}/lib/cmake/llvm)
+endif(DEFINED ENV{LLVM_HOME})
+find_package(LLVM REQUIRED CONFIG)
+message(STATUS "Found LLVM ${LLVM_PACKAGE_VERSION}")
+message(STATUS "Using LLVMConfig.cmake in: ${LLVM_DIR}")
+llvm_map_components_to_libnames(llvm_libs support core mcjit x86codegen x86asmparser)
+
 find_package(Threads)
 find_package(Tcmalloc)
+find_package(ZLIB)
+find_package(SystemC)
+if(SystemC_FOUND)
+        message(STATUS "SystemC headers at ${SystemC_INCLUDE_DIRS}")
+        message(STATUS "SystemC library at ${SystemC_LIBRARY_DIRS}")
+        if(SCV_FOUND)
+            message(STATUS "SCV headers at ${SCV_INCLUDE_DIRS}")
+            message(STATUS "SCV library at ${SCV_LIBRARY_DIRS}")
+        endif(SCV_FOUND)
+        if(CCI_FOUND)
+            message(STATUS "CCI headers at ${CCI_INCLUDE_DIRS}")
+            message(STATUS "CCI library at ${CCI_LIBRARY_DIRS}")
+        endif()
+endif(SystemC_FOUND)
 
 set(PROJECT_3PARTY_DIRS external)
 include(clang-format)
 
+set(ENABLE_CLANG_TIDY OFF CACHE BOOL "Add clang-tidy automatically to builds")
+if (ENABLE_CLANG_TIDY)
+    find_program (CLANG_TIDY_EXE NAMES "clang-tidy" PATHS /usr/local/opt/llvm/bin )
+    if (CLANG_TIDY_EXE)
+        message(STATUS "clang-tidy found: ${CLANG_TIDY_EXE}")
+        set(CLANG_TIDY_CHECKS "-*,modernize-*")
+        set(CMAKE_CXX_CLANG_TIDY "${CLANG_TIDY_EXE};-checks=${CLANG_TIDY_CHECKS};-header-filter='${CMAKE_SOURCE_DIR}/*';-fix"
+            CACHE STRING "" FORCE)
+    else()
+        message(AUTHOR_WARNING "clang-tidy not found!")
+        set(CMAKE_CXX_CLANG_TIDY "" CACHE STRING "" FORCE) # delete it
+    endif()
+endif()
+  
+# Set the version number of your project here (format is MAJOR.MINOR.PATCHLEVEL - e.g. 1.0.0)
+set(VERSION_MAJOR "1")
+set(VERSION_MINOR "0")
+set(VERSION_PATCH "0")
+set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
+
 add_subdirectory(external)
 add_subdirectory(dbt-core)
 add_subdirectory(sc-components)