diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2adab1d..d667aae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,7 +55,7 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
 	
 	set(CONAN_BOOST_OPTIONS
 	boost:fPIC=True
-	boost:shared=${SHARED_FLAG}
+	boost:shared=False
 	boost:header_only=False 
 	boost:without_contract=True
 	boost:without_graph=True
@@ -217,7 +217,12 @@ if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
 endif()
 
 add_subdirectory(dbt-rise-core)
-add_subdirectory(scc)
+if(CMAKE_PROJECT_NAME STREQUAL "TGC-ISS")
+	set(SCC_CMAKE_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/scc)
+	add_subdirectory(scc/src/common)
+else()
+	add_subdirectory(scc)
+endif()
 add_subdirectory(dbt-rise-tgc)
 if(IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dbt-rise-plugins)
 	add_subdirectory(dbt-rise-plugins)
diff --git a/dbt-rise-tgc b/dbt-rise-tgc
index f4f90c5..db5765b 160000
--- a/dbt-rise-tgc
+++ b/dbt-rise-tgc
@@ -1 +1 @@
-Subproject commit f4f90c5e65573d3bc979f447e3f78f794499d36e
+Subproject commit db5765b3429efd6674e349ab5a6cd2b8b258dd1a
diff --git a/scc b/scc
index 94569ea..89a77ff 160000
--- a/scc
+++ b/scc
@@ -1 +1 @@
-Subproject commit 94569eac10c4b8b5e3be6f8bcea7412b6e91396b
+Subproject commit 89a77ff6be0ca2776ca5514905bcddaa0c1e304c