From d2a9b1a74480482ae4e5d3b1a1c3a0d02760dabc Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Sat, 15 Jun 2019 20:21:50 +0000
Subject: [PATCH] Bumped SystemC version

---
 .cproject                   |  2 +-
 cmake/Conan.cmake           | 13 +++++++++----
 conanfile.txt               |  5 ++++-
 platform/src/CMakeLists.txt |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.cproject b/.cproject
index 2186584..69c22d9 100644
--- a/.cproject
+++ b/.cproject
@@ -17,7 +17,7 @@
 					<folderInfo id="cdt.managedbuild.config.gnu.exe.debug.1751741082." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.exe.debug.1289745146" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.exe.debug">
 							<targetPlatform binaryParser="org.eclipse.cdt.core.GNU_ELF;org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.exe.debug.1460698591" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
-							<builder buildPath="/RISCV-VP/build/Debug" id="de.marw.cdt.cmake.core.genscriptbuilder.2135578907" keepEnvironmentInBuildfile="false" name="CMake Builder (portable)" parallelBuildOn="false" superClass="de.marw.cdt.cmake.core.genscriptbuilder"/>
+							<builder buildPath="/RISCV-VP/build/Debug" id="de.marw.cdt.cmake.core.genscriptbuilder.2135578907" keepEnvironmentInBuildfile="false" name="CMake Builder (portable)" parallelBuildOn="true" parallelizationNumber="optimal" superClass="de.marw.cdt.cmake.core.genscriptbuilder"/>
 							<tool id="cdt.managedbuild.tool.gnu.archiver.base.366643800" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1510612390" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
 								<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.1768317780" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
diff --git a/cmake/Conan.cmake b/cmake/Conan.cmake
index 7fd859f..1ee45f6 100644
--- a/cmake/Conan.cmake
+++ b/cmake/Conan.cmake
@@ -24,7 +24,7 @@ macro(setup_conan)
   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")
@@ -33,9 +33,14 @@ macro(setup_conan)
 	set(CONAN_BUILD_TYPE ${CMAKE_BUILD_TYPE})
   endif()
 
-  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)
+  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()
diff --git a/conanfile.txt b/conanfile.txt
index 3d6f0e2..90b3ec3 100644
--- a/conanfile.txt
+++ b/conanfile.txt
@@ -3,7 +3,7 @@
     spdlog/0.16.3@bincrafters/stable
     fmt/5.2.1@bincrafters/stable 
     Seasocks/1.3.2@minres/stable
-    SystemC/2.3.2@minres/stable
+    SystemC/2.3.3@minres/stable
     SystemCVerification/2.0.1@minres/stable
     SystemC-CCI/1.0.0@minres/stable
 
@@ -16,4 +16,7 @@
     SystemC:stdcxx=14
     SystemC:shared=True
     SystemCVerification:stdcxx=14
+    SystemCVerification:shared=True
     SystemC-CCI:stdcxx=14
+    SystemC-CCI:shared=True
+    
\ No newline at end of file
diff --git a/platform/src/CMakeLists.txt b/platform/src/CMakeLists.txt
index c66478c..666b523 100644
--- a/platform/src/CMakeLists.txt
+++ b/platform/src/CMakeLists.txt
@@ -49,7 +49,7 @@ set_target_properties(${LIBRARY_NAME} PROPERTIES
 )
 
 # This is a make target, so you can do a "make riscv-sc"
-set(APPLICATION_NAME riscv.vp)
+set(APPLICATION_NAME riscv-vp)
 
 include_directories(${PROJECT_SOURCE_DIR}/incl)
 include_directories(${CONAN_INCLUDE_DIRS_SEASOCKS})