From 9659d1749691c2f2f060999e8395ebefafcae1cb Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sat, 4 Sep 2021 13:05:47 +0200
Subject: [PATCH] update build system and add tgc_c_xrb_mac option

---
 CMakeLists.txt | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
 conanfile.txt  | 16 ----------------
 scc            |  2 +-
 tgfs           |  2 +-
 4 files changed, 49 insertions(+), 19 deletions(-)
 delete mode 100644 conanfile.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d2d1e8..48c8ca1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,53 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
     set(warnings "/W4 /WX /EHsc")
 endif()
 
-setup_conan(TARGETS)
+include(ConanInline)
+conan_check()
+set(CONAN_BOOST_OPTIONS
+boost:fPIC=True
+boost:shared=True
+boost:header_only=False 
+boost:without_context=True
+boost:without_contract=True
+boost:without_coroutine=True
+boost:without_fiber=True
+boost:without_graph=True
+boost:without_graph_parallel=True
+boost:without_iostreams=True
+boost:without_json=True
+boost:without_locale=True
+boost:without_log=True
+boost:without_math=True
+boost:without_mpi=True
+boost:without_nowide=True
+boost:without_python=True
+boost:without_random=True
+boost:without_regex=True
+boost:without_serialization=True
+boost:without_stacktrace=True
+boost:without_test=True
+boost:without_timer=True
+boost:without_type_erasure=True
+boost:without_wave=True
+)
+set(CONAN_PACKAGES fmt/6.1.2 zlib/1.2.11 boost/1.75.0 gsl-lite/0.37.0 elfio/3.8 tcc/0.9.27)
+set(CONAN_SETTINGS fmt:header_only=True ${CONAN_BOOST_OPTIONS})
+if(NOT DEFINED ENV{SYSTEMC_HOME})
+    set(CONAN_PACKAGES ${CONAN_PACKAGES}
+        systemc/2.3.3
+        systemc-cci/1.0.0
+        )
+    set(CONAN_SETTINGS ${CONAN_SETTINGS}  
+        #systemc:phase_cb=False
+        systemc-cci:shared=False
+        )
+endif()
+conan_configure(REQUIRES ${CONAN_PACKAGES}
+                GENERATORS cmake_find_package
+                OPTIONS ${CONAN_SETTINGS}
+                )
+conan_install()
+conan_setup(TARGETS)
 
 # 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.
diff --git a/conanfile.txt b/conanfile.txt
deleted file mode 100644
index 99a0316..0000000
--- a/conanfile.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-[requires]
-    fmt/6.1.2
-    zlib/1.2.11
-    boost/1.75.0
-    gsl-lite/0.37.0
-	elfio/3.8
-    tcc/0.9.27
-	
-[generators]
-    cmake
-
-[options]
-    boost:fPIC=True
-    boost:shared=False
-    boost:header_only=False
-    fmt:header_only=True
diff --git a/scc b/scc
index 9919e5a..1f18a7b 160000
--- a/scc
+++ b/scc
@@ -1 +1 @@
-Subproject commit 9919e5a350e79ad4a5e9b4b573b4680af0fde05b
+Subproject commit 1f18a7b15d63df18df876333431c43e4c6d2ad24
diff --git a/tgfs b/tgfs
index a308445..0fd82f1 160000
--- a/tgfs
+++ b/tgfs
@@ -1 +1 @@
-Subproject commit a3084456fdf816db6234980024384e88f19b0466
+Subproject commit 0fd82f1f3c0371fa3b629f96dab598991168eed1