From 273055d00cc3bf0cc377b2ef3782a848892d10c8 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sun, 14 Dec 2025 01:14:09 -0800 Subject: [PATCH 1/2] fixes dependencies --- CMakeLists.txt | 7 +++++-- cmake/scc-config.cmake.in | 3 +-- contrib/install_wo_conan.cmd | 2 +- contrib/install_wo_conan.sh | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 30f22735f..c53d547ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,8 +48,11 @@ if(BUILD_SCC_DOCUMENTATION) add_subdirectory(doc) endif() set(SCC_CMAKE_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/scc) - - +if(BUILD_SCC_LIB_ONLY + message(STATUS "SCC: Building only library") +else() + message(STATUS "SCC: Building library, test, and examples") +endif ############################################################################### # build the SCC ############################################################################### diff --git a/cmake/scc-config.cmake.in b/cmake/scc-config.cmake.in index 510cb61fb..2341b0a14 100644 --- a/cmake/scc-config.cmake.in +++ b/cmake/scc-config.cmake.in @@ -4,9 +4,8 @@ include(CMakeFindDependencyMacro) find_dependency(SystemCLanguage) find_dependency(lwtr) find_dependency(fstapi) -find_dependency(boost_system @MIN_BOOST_VERSION@) +find_dependency(boost_filesystem @MIN_BOOST_VERSION@) find_dependency(boost_date_time @MIN_BOOST_VERSION@) -find_dependency(boost_stacktrace_backtrace @MIN_BOOST_VERSION@) find_dependency(spdlog) find_dependency(lz4) find_dependency(fmt) diff --git a/contrib/install_wo_conan.cmd b/contrib/install_wo_conan.cmd index f36d04597..9ded518e3 100644 --- a/contrib/install_wo_conan.cmd +++ b/contrib/install_wo_conan.cmd @@ -34,7 +34,7 @@ set TOOLSET=msvc-14.3 @REM we need to keep CMAKE_POLICY_VERSION_MINIMUM=3.5 unless yaml-cpp, SystemC & SystemC-AMS have fixed their build system set CMAKE_OPTS=-G "%GENERATOR%" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_GENERATOR_PLATFORM=x64 -DCMAKE_CXX_STANDARD=%CXX_STD% -DCMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY=ON -DCMAKE_PREFIX_PATH=%SCC_HOME% -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -set BOOST_LIB_EXCLUDE=--without-contract --without-fiber --without-graph --without-graph_parallel --without-iostreams --without-json --without-locale --without-log --without-math --without-mpi --without-nowide --without-python --without-random --without-stacktrace --without-test --without-timer --without-wave +set BOOST_LIB_EXCLUDE=--without-contract --without-fiber --without-graph --without-graph_parallel --without-iostreams --without-json --without-locale --without-log --without-math --without-mpi --without-nowide --without-python --without-random --without-test --without-timer --without-wave set BOOST_CMAKE_OPTS=-DBoost_NO_SYSTEM_PATHS=TRUE -DBOOST_ROOT=%SCC_HOME% -DBOOST_INCLUDEDIR=%SCC_HOME%\include\boost-1_89 -DBoost_NO_WARN_NEW_VERSIONS=ON -DBoost_USE_STATIC_LIBS=ON -DBoost_USE_MULTITHREADED=ON -DBoost_USE_STATIC_RUNTIME=OFF @REM ############################################################################################ @REM build_boost diff --git a/contrib/install_wo_conan.sh b/contrib/install_wo_conan.sh index 4d96d7d60..968f07abb 100644 --- a/contrib/install_wo_conan.sh +++ b/contrib/install_wo_conan.sh @@ -74,7 +74,7 @@ fi # ############################################################################################ function build_boost { - export BOOST_LIB_EXCLUDE=contract,fiber,graph,graph_parallel,iostreams,json,locale,log,math,mpi,nowide,python,random,stacktrace,test,timer,wave + export BOOST_LIB_EXCLUDE=contract,fiber,graph,graph_parallel,iostreams,json,locale,log,math,mpi,nowide,python,random,test,timer,wave if [ ! -d boost_1_89_0 ]; then [ -f boost_1_89_0.tar.bz2 ] || wget https://archives.boost.io/release/1.89.0/source/boost_1_89_0.tar.bz2 From 78289499e76aeacf057b38a5a295c4b035997060 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sun, 14 Dec 2025 01:21:51 -0800 Subject: [PATCH 2/2] corrects typo --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c53d547ae..e0c2fac5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,11 +48,11 @@ if(BUILD_SCC_DOCUMENTATION) add_subdirectory(doc) endif() set(SCC_CMAKE_CONFIG_DIR ${CMAKE_INSTALL_LIBDIR}/cmake/scc) -if(BUILD_SCC_LIB_ONLY +if(BUILD_SCC_LIB_ONLY) message(STATUS "SCC: Building only library") else() - message(STATUS "SCC: Building library, test, and examples") -endif + message(STATUS "SCC: Building library, tests, and examples") +endif() ############################################################################### # build the SCC ###############################################################################