Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace clapack #27

Merged
merged 5 commits into from
Sep 3, 2021
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
22 changes: 15 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,10 @@ if(EMSCRIPTEN)
set(BUILD_WITH_SIMBODY 1)
set(ONLY_3D 1)
set(BUILD_TESTS 1)
set(BUILD_STATIC_LIBRARIES on) # Simbody
set(BUILD_DYNAMIC_LIBRARIES off) # Simbody
add_definitions(-DSIMBODY_WITHOUT_LAPACK)
add_definitions(-D__SIMBODY_WITHOUT_LAPACK__)
add_definitions(-D__EIGEN__)
add_definitions(-D__EMSCRIPTEN__)

set(EIGEN_ROOT ${SPHINXSYS_PROJECT_DIR}/3rd_party/eigen)
message("${EIGEN_ROOT}")
include_directories("${EIGEN_ROOT}")

remove_definitions(-DTBB_2021_2_0)
set(TBB_ROOT ${SPHINXSYS_PROJECT_DIR}/3rd_party/wasmtbb)
include_directories("${TBB_ROOT}/include")
Expand All @@ -38,6 +33,19 @@ else()
add_definitions(-DBOOST_AVAILABLE)
endif()

if(BUILD_WITH_SIMBODY)
add_definitions(-D__SIMBODY_WITHOUT_LAPACK__)
add_definitions(-D__EIGEN__)
set(EIGEN_ROOT ${SPHINXSYS_PROJECT_DIR}/3rd_party/eigen)
message("${EIGEN_ROOT}")
include_directories("${EIGEN_ROOT}")
endif()

if(STATIC_BUILD)
set(BUILD_STATIC_LIBRARIES 1) # Simbody
set(BUILD_DYNAMIC_LIBRARIES 0) # Simbody
endif()

if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
# Set the possible values of build type for cmake-gui
Expand Down
43 changes: 0 additions & 43 deletions build.sh

This file was deleted.

17 changes: 0 additions & 17 deletions package.json

This file was deleted.

17 changes: 0 additions & 17 deletions wasm-new.Dockerfile

This file was deleted.