diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c9016c..0976948 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${C project(pysysc-sc) -set(ENABLE_SHARED TRUE CACHE BOOL "Build shared libraries") +option(INSTALL_DEPENDENCIES "Should dependencies be installed when installing SCC" OFF) include(GNUInstallDirs) include(BuildType) @@ -32,73 +32,57 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") set(warnings "/W4 /WX /EHsc") endif() +include(GNUInstallDirs) + 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 boost/1.75.0) -set(CONAN_SETTINGS ${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 - ) +if(EXISTS /etc/redhat-release) + # Boost on CentOS quirks: the b2 of conan-center is build against a newer libstdc++ and therefore does not run + # with the oooooold libs on CentOS 7. Therefore we build our own version of b2 if it is not there + set(B2_VERSION 4.9.2) + set(B2_META $ENV{HOME}/.conan/data/b2/${B2_VERSION}/_/_/metadata.json) + if(DEFINED ENV{CONAN_USER_HOME}) + set(B2_META $ENV{CONAN_USER_HOME}/.conan/data/b2/${B2_VERSION}/_/_/metadata.json) + endif() + if(NOT EXISTS ${B2_META}) + conan_configure(REQUIRES b2/${B2_VERSION}) + conan_cmake_autodetect(settings) + conan_cmake_install(PATH_OR_REFERENCE . BUILD b2 SETTINGS ${settings}) + endif() + # Boost on CentOS quirks end endif() -conan_configure(REQUIRES ${CONAN_PACKAGES} - GENERATORS cmake_find_package - OPTIONS ${CONAN_SETTINGS} - ) -conan_install() -conan_setup(TARGETS) +set(CONAN_PACKAGE_LIST fmt/8.0.1 spdlog/1.9.2 zlib/1.2.11 boost/1.75.0 yaml-cpp/0.7.0 lz4/1.9.3) +if(BUILD_SCC_DOCUMENTATION) + list(APPEND CONAN_PACKAGE_LIST doxygen/1.9.2) +endif() +set(CONAN_PACKAGE_OPTIONS fmt:header_only=True spdlog:header_only=True boost:without_stacktrace=True boost:shared=False boost:header_only=False) +if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") + list(APPEND CONAN_PACKAGE_OPTIONS boost:fPIC=True) +endif() +if(NOT USE_CWR_SYSTEMC AND NOT USE_NCSC_SYSTEMC AND NOT DEFINED ENV{SYSTEMC_HOME}) + set(CONAN_PACKAGE_LIST ${CONAN_PACKAGE_LIST} systemc/2.3.3 systemc-cci/1.0.0) + set(CONAN_PACKAGE_OPTIONS ${CONAN_PACKAGE_OPTIONS} systemc-cci:shared=False) +endif() + +conan_configure(REQUIRES ${CONAN_PACKAGE_LIST} GENERATORS cmake_find_package OPTIONS ${CONAN_PACKAGE_OPTIONS}) +if(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo") + conan_install(BUILD_TYPE Release) +else() + conan_install() +endif() +set(CONAN_CMAKE_SILENT_OUTPUT ON) + +set(Boost_NO_BOOST_CMAKE ON) # Don't do a find_package in config mode before searching for a regular boost install. # 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. find_package(Boost COMPONENTS program_options system thread REQUIRED) +find_package(spdlog REQUIRED) +find_package(lz4 REQUIRED) +find_package(fmt REQUIRED) +find_package(yaml-cpp REQUIRED) -# set-up SystemC and SCV include(SystemCPackage) -if(SystemC_FOUND) - include_directories(${SystemC_INCLUDE_DIRS}) - link_directories(${SystemC_LIBRARY_DIRS}) -else() - message( FATAL_ERROR "SystemC library not found." ) -endif() - -if(CCI_FOUND) - include_directories(${CCI_INCLUDE_DIRS}) - link_directories(${CCI_LIBRARY_DIRS}) -#else() - #message( FATAL_ERROR "SystemC CCI library not found." ) -endif() add_subdirectory(scc) add_subdirectory(vp_components) diff --git a/scc b/scc index 1b28dad..f1d272d 160000 --- a/scc +++ b/scc @@ -1 +1 @@ -Subproject commit 1b28dadcb3510550fea0d7c383511e502bae2582 +Subproject commit f1d272d59fb597a1eb616a02ec6c0cf8684716df diff --git a/vp_components/CMakeLists.txt b/vp_components/CMakeLists.txt index 0d98499..49ee324 100644 --- a/vp_components/CMakeLists.txt +++ b/vp_components/CMakeLists.txt @@ -1,13 +1,26 @@ set(LIB_SOURCES - initiator.cpp - target.cpp - clkgen.cpp - resetgen.cpp + ) -# Define two variables in order not to repeat ourselves. -set(LIBRARY_NAME vp_components) # Define the library -add_library(${LIBRARY_NAME} SHARED ${LIB_SOURCES}) -target_link_libraries (${LIBRARY_NAME} LINK_PUBLIC scc) -target_include_directories (${LIBRARY_NAME} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +add_library(vp_components + initiator.cpp + target.cpp + clkgen.cpp + resetgen.cpp) +target_link_libraries(vp_components LINK_PUBLIC scc) +target_include_directories(vp_components PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +install(TARGETS vp_components + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + ) +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} # target directory + FILES_MATCHING # install only matched files + PATTERN "*.h" # select header files + ) + +