Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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, tests, and examples")
endif()
###############################################################################
# build the SCC
###############################################################################
Expand Down
3 changes: 1 addition & 2 deletions cmake/scc-config.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion contrib/install_wo_conan.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion contrib/install_wo_conan.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down