Skip to content

Commit

Permalink
Replace clapack (#27)
Browse files Browse the repository at this point in the history
* work on eigen

* all tests pass with Eigen

* macro renamed simbody

* all SPH tests pass for static build

* remove wasm files
  • Loading branch information
BenceVirtonomy authored Sep 3, 2021
1 parent e4865a8 commit 25960d0
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 84 deletions.
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.

0 comments on commit 25960d0

Please sign in to comment.