From 3b9fdfde0a86f777d8e5e5a5735e2ebe2ca3f7f1 Mon Sep 17 00:00:00 2001
From: eyck <eyck@minres.com>
Date: Sun, 5 Apr 2020 20:06:42 +0200
Subject: [PATCH] update scc

---
 CMakeLists.txt    | 18 ++++++++---------
 cmake/Conan.cmake | 51 -----------------------------------------------
 scc               |  2 +-
 3 files changed, 10 insertions(+), 61 deletions(-)
 delete mode 100644 cmake/Conan.cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c0372f..c934ee6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,12 +9,12 @@ set(ENABLE_SHARED TRUE CACHE BOOL "Build shared libraries")
 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()
+#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 scc dbt-core)
@@ -29,7 +29,7 @@ set(GIT_SUBMODULE_BRANCH_dbt-core ${GIT_BRANCH})
 set(GIT_SUBMODULE_BRANCH_riscv ${GIT_BRANCH})
 
 include(GNUInstallDirs)
-include(Submodules)
+#include(Submodules)
 include(Conan)
 
 #enable_testing() 
@@ -58,7 +58,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     set(warnings "/W4 /WX /EHsc")
 endif()
 
-setup_conan()
+setup_conan(Release)
 
 # 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.
@@ -76,7 +76,7 @@ set(BUILD_SHARED_LIBS 1)
 find_package(Threads)
 find_package(Tcmalloc)
 find_package(ZLIB)
-find_package(SystemC)
+find_package(OSCISystemC)
 if(SystemC_FOUND)
         message(STATUS "SystemC headers at ${SystemC_INCLUDE_DIRS}")
         message(STATUS "SystemC library at ${SystemC_LIBRARY_DIRS}")
diff --git a/cmake/Conan.cmake b/cmake/Conan.cmake
deleted file mode 100644
index 1ee45f6..0000000
--- a/cmake/Conan.cmake
+++ /dev/null
@@ -1,51 +0,0 @@
-macro(setup_conan)
-  find_program(conan conan)
-  if(NOT EXISTS ${conan})
-    message(FATAL_ERROR "Conan is required. Please see README.md")
-    return()
-  endif()
-
-  if(${CMAKE_HOST_SYSTEM_NAME} STREQUAL Darwin)
-    set(os Macos)
-  else()
-    set(os ${CMAKE_HOST_SYSTEM_NAME})
-  endif()
-
-  if(${CMAKE_CXX_COMPILER_ID} STREQUAL GNU)
-    set(compiler gcc)
-  elseif(${CMAKE_CXX_COMPILER_ID} STREQUAL AppleClang)
-    set(compiler apple-clang)
-  else()
-    message(FATAL_ERROR "Unknown compiler: ${CMAKE_CXX_COMPILER_ID}")
-  endif()
-
-  string(SUBSTRING ${CMAKE_CXX_COMPILER_VERSION} 0 3 compiler_version)
-
-  set(conanfile ${CMAKE_SOURCE_DIR}/conanfile.txt)
-  set(conanfile_cmake ${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
-  set(compiler_libcxx libstdc++11)
-  
-  if("${CMAKE_BUILD_TYPE}" STREQUAL "")
-	set(CONAN_BUILD_TYPE Debug)
-  elseif("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
-	set(CONAN_BUILD_TYPE Release)
-  else()
-	set(CONAN_BUILD_TYPE ${CMAKE_BUILD_TYPE})
-  endif()
-
-  if(${CMAKE_CXX_STANDARD} EQUAL 98)
-    execute_process(COMMAND ${conan} install --build=missing
-	    -s build_type=${CONAN_BUILD_TYPE} -s compiler.libcxx=${compiler_libcxx}
-	    ${CMAKE_SOURCE_DIR} RESULT_VARIABLE return_code)
-  else()
-    execute_process(COMMAND ${conan} install --build=missing -s build_type=${CONAN_BUILD_TYPE}
-	    ${CMAKE_SOURCE_DIR} RESULT_VARIABLE return_code)
-  endif()
-  if(NOT ${return_code} EQUAL 0)
-    message(FATAL_ERROR "conan install command failed.")
-  endif()
-
-  include(${conanfile_cmake})
-  #conan_basic_setup(TARGETS)
-  conan_basic_setup()
-endmacro()
diff --git a/scc b/scc
index fbe11cf..86ce966 160000
--- a/scc
+++ b/scc
@@ -1 +1 @@
-Subproject commit fbe11cf926d0078836d250910617b139e0581d5c
+Subproject commit 86ce966985e9c8dd436ee0938922efa73fcf7c79