Merge branch 'develop'

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "axi_chi"]
 	path = third_party/axi_chi
 	url = https://github.com/Arteris-IP/tlm2-interfaces.git
+[submodule "third_party/lwtr4sc"]
+	path = third_party/lwtr4sc
+	url = https://github.com/Minres/LWTR4SC.git

README.md

@@ -60,7 +60,7 @@ The full documentation can be found at the [Github pages](https://minres.github.
 Build instructions
 ==================
 
-The repo is cmake based and uses conan. Make sure that you have at least cmake 3.16 and conan installed.
+The repo is cmake based and uses conan. Make sure that you have at least cmake 3.16 and conan version 1.59.0 installed. There known issues with conan 2.x. Other combinations may work, but are not tested.
 
 The suggested build steps are:
 

cmake/CMakeDebugHelper.cmake

@@ -0,0 +1,113 @@
+## https://stackoverflow.com/questions/32183975/how-to-print-all-the-properties-of-a-target-in-cmake/56738858#56738858
+## https://stackoverflow.com/a/56738858/3743145
+
+# Sets the AVAILABLE_CONFIGURATION_TYPES variable to the default available configurations
+# (For some reason, CMAKE_CONFIGURATION_TYPES tends to be empty)
+function(get_available_configuration_types)
+    # Get all variables that cmake cache defines by default
+    execute_process(COMMAND cmake -LAH -N OUTPUT_VARIABLE CMAKE_CACHE_VARIABLE_LIST)
+
+    # Convert command output into a CMake list
+    string(REGEX REPLACE ";" "[:semicolon:]" CMAKE_CACHE_VARIABLE_LIST "${CMAKE_CACHE_VARIABLE_LIST}")
+    string(REGEX REPLACE "\n" ";" CMAKE_CACHE_VARIABLE_LIST "${CMAKE_CACHE_VARIABLE_LIST}")
+
+    # filter down to the variables
+    list(FILTER CMAKE_CACHE_VARIABLE_LIST EXCLUDE REGEX "^$|^//.*$|^\-\-$")
+
+    # Get the configuration types
+    set(AVAILABLE_CONFIGURATION_TYPES ${CMAKE_CACHE_VARIABLE_LIST})
+    list(FILTER AVAILABLE_CONFIGURATION_TYPES INCLUDE REGEX "^CMAKE_CONFIGURATION_TYPES")
+    list(GET AVAILABLE_CONFIGURATION_TYPES 0 AVAILABLE_CONFIGURATION_TYPES)
+    string(REGEX REPLACE ".*=" "" AVAILABLE_CONFIGURATION_TYPES "${AVAILABLE_CONFIGURATION_TYPES}")
+    string(REPLACE "[:semicolon:]" ";" AVAILABLE_CONFIGURATION_TYPES "${AVAILABLE_CONFIGURATION_TYPES}")
+    string(TOUPPER "${AVAILABLE_CONFIGURATION_TYPES}" AVAILABLE_CONFIGURATION_TYPES)
+
+    # Add the current build type if it isn't already there
+    string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE)
+    list(FILTER AVAILABLE_CONFIGURATION_TYPES EXCLUDE REGEX ${BUILD_TYPE})
+    list(APPEND AVAILABLE_CONFIGURATION_TYPES ${BUILD_TYPE})
+    list(SORT AVAILABLE_CONFIGURATION_TYPES)
+
+    # make AVAILABLE_CONFIGURATION_TYPES available to parent
+    set(AVAILABLE_CONFIGURATION_TYPES ${AVAILABLE_CONFIGURATION_TYPES} PARENT_SCOPE)
+endfunction()
+
+# Sets the CMAKE_PROPERTY_LIST and CMAKE_WHITELISTED_PROPERTY_LIST variables to
+# the list of properties
+function(get_cmake_property_list)
+    # See https://stackoverflow.com/a/44477728/240845
+    set(LANGS ASM-ATT ASM ASM_MASM ASM_NASM C CSHARP CUDA CXX FORTRAN HIP ISPC JAVA OBJC OBJCXX RC SWIFT)
+    get_available_configuration_types()
+
+    # Get all propreties that cmake supports
+    execute_process(COMMAND cmake --help-property-list OUTPUT_VARIABLE CMAKE_PROPERTY_LIST)
+
+    # Convert command output into a CMake list
+    string(REGEX REPLACE ";" "\\\\;" CMAKE_PROPERTY_LIST "${CMAKE_PROPERTY_LIST}")
+    string(REGEX REPLACE "\n" ";" CMAKE_PROPERTY_LIST "${CMAKE_PROPERTY_LIST}")
+
+    # Populate "<CONFIG>" with AVAILBLE_CONFIG_TYPES
+    set(CONFIG_LINES ${CMAKE_PROPERTY_LIST})
+    list(FILTER CONFIG_LINES INCLUDE REGEX "<CONFIG>")
+    list(FILTER CMAKE_PROPERTY_LIST EXCLUDE REGEX "<CONFIG>")
+    foreach(CONFIG_LINE IN LISTS CONFIG_LINES)
+        foreach(CONFIG_VALUE IN LISTS AVAILABLE_CONFIGURATION_TYPES)
+            string(REPLACE "<CONFIG>" "${CONFIG_VALUE}" FIXED "${CONFIG_LINE}")
+            list(APPEND CMAKE_PROPERTY_LIST ${FIXED})
+        endforeach()
+    endforeach()
+
+    # Populate "<LANG>" with LANGS
+    set(LANG_LINES ${CMAKE_PROPERTY_LIST})
+    list(FILTER LANG_LINES INCLUDE REGEX "<LANG>")
+    list(FILTER CMAKE_PROPERTY_LIST EXCLUDE REGEX "<LANG>")
+    foreach(LANG_LINE IN LISTS LANG_LINES)
+        foreach(LANG IN LISTS LANGS)
+            string(REPLACE "<LANG>" "${LANG}" FIXED "${LANG_LINE}")
+            list(APPEND CMAKE_PROPERTY_LIST ${FIXED})
+        endforeach()
+    endforeach()
+
+    # no repeats
+    list(REMOVE_DUPLICATES CMAKE_PROPERTY_LIST)
+
+    # Fix https://stackoverflow.com/questions/32197663/how-can-i-remove-the-the-location-property-may-not-be-read-from-target-error-i
+    list(FILTER CMAKE_PROPERTY_LIST EXCLUDE REGEX "^LOCATION$|^LOCATION_|_LOCATION$")
+
+    list(SORT CMAKE_PROPERTY_LIST)
+
+    # Whitelisted property list for use with interface libraries to reduce warnings
+    set(CMAKE_WHITELISTED_PROPERTY_LIST ${CMAKE_PROPERTY_LIST})
+
+    # regex from https://stackoverflow.com/a/51987470/240845
+    list(FILTER CMAKE_WHITELISTED_PROPERTY_LIST INCLUDE REGEX "^(INTERFACE|[_a-z]|IMPORTED_LIBNAME_|MAP_IMPORTED_CONFIG_)|^(COMPATIBLE_INTERFACE_(BOOL|NUMBER_MAX|NUMBER_MIN|STRING)|EXPORT_NAME|IMPORTED(_GLOBAL|_CONFIGURATIONS|_LIBNAME)?|NAME|TYPE|NO_SYSTEM_FROM_IMPORTED)$")
+
+    # make the lists available
+    set(CMAKE_PROPERTY_LIST ${CMAKE_PROPERTY_LIST} PARENT_SCOPE)
+    set(CMAKE_WHITELISTED_PROPERTY_LIST ${CMAKE_WHITELISTED_PROPERTY_LIST} PARENT_SCOPE)
+endfunction()
+
+get_cmake_property_list()
+
+function(print_target_properties tgt)
+    if(NOT TARGET ${tgt})
+      message("There is no target named '${tgt}'")
+      return()
+    endif()
+
+    get_target_property(target_type ${tgt} TYPE)
+    if(target_type STREQUAL "INTERFACE_LIBRARY")
+        set(PROPERTIES ${CMAKE_WHITELISTED_PROPERTY_LIST})
+    else()
+        set(PROPERTIES ${CMAKE_PROPERTY_LIST})
+    endif()
+
+    foreach (prop ${PROPERTIES})
+        #message ("Checking ${prop}")
+        get_property(propval TARGET ${tgt} PROPERTY ${prop} SET)
+        if (propval)
+            get_target_property(propval ${tgt} ${prop})
+            message ("${tgt} ${prop} = ${propval}")
+        endif()
+    endforeach(prop)
+endfunction(print_target_properties)

cmake/ConanInline.cmake

@@ -19,8 +19,7 @@ macro(conan_check)
 
   if(NOT EXISTS ${CONAN_CMAKE_LIST_DIR}/conan.cmake)
     message("Downloading conan.cmake to ${CONAN_CMAKE_LIST_DIR}")
-    #set(URL https://raw.githubusercontent.com/conan-io/cmake-conan/develop/conan.cmake)
-    set(URL https://raw.githubusercontent.com/conan-io/cmake-conan/43e385830ee35377dbd2dcbe8d5a9e750301ea00/conan.cmake)
+    set(URL https://raw.githubusercontent.com/conan-io/cmake-conan/0.18.1/conan.cmake)
     file(DOWNLOAD ${URL} ${CONAN_CMAKE_LIST_DIR}/conan.cmake TIMEOUT 60 STATUS DOWNLOAD_STATUS)
     list(GET DOWNLOAD_STATUS 0 STATUS_CODE)
     list(GET DOWNLOAD_STATUS 1 ERROR_MESSAGE)
@@ -74,25 +73,35 @@ function(conan_configure)
 endfunction()
 
 macro(conan_install)
-  	set(options BUILD_TYPE) 
- 	set(oneValueArgs BUILD_TYPE)
+  	set(options BUILD_TYPE BUILD) 
+ 	set(oneValueArgs BUILD_TYPE BUILD)
 	cmake_parse_arguments(MARGS "" "${oneValueArgs}" "" ${ARGN} )
   	if(MARGS_BUILD_TYPE)
 		conan_cmake_autodetect(settings BUILD_TYPE ${MARGS_BUILD_TYPE})
   	else()
 		conan_cmake_autodetect(settings BUILD_TYPE)
 	endif()
 	if(CMAKE_CXX_STANDARD)
-		set(settings ${settings} compiler.cppstd=${CMAKE_CXX_STANDARD})
+		list(APPEND settings compiler.cppstd=${CMAKE_CXX_STANDARD})
+	endif()
+	if(USE_NCSC_SYSTEMC)
+		list(APPEND settings compiler.libcxx=libstdc++)
 	endif()
 	if (NOT "$ENV{CONAN_PROFILE_NAME}" STREQUAL "")
     	set(CONAN_PROFILE "$ENV{CONAN_PROFILE_NAME}" CACHE INTERNAL "Copied from environment variable")
     else()
     	set(CONAN_PROFILE "default" CACHE INTERNAL "Copied from environment variable")
    endif()
 
+  	if(MARGS_BUILD)
+	conan_cmake_install(PATH_OR_REFERENCE .
+	                    BUILD ${MARGS_BUILD}
+	                    PROFILE_BUILD ${CONAN_PROFILE}
+	                    SETTINGS ${settings})
+	else()
 	conan_cmake_install(PATH_OR_REFERENCE .
 	                    BUILD missing
-	                    PROFILE ${CONAN_PROFILE}
+	                    PROFILE_BUILD ${CONAN_PROFILE}
 	                    SETTINGS ${settings})
+    endif()
 endmacro()