Skip to content

Commit 578880c

Browse files
committed
#60: remove built-in pressio dir and add cloning to CMakeLists
1 parent 02aed58 commit 578880c

File tree

446 files changed

+15
-76181
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

446 files changed

+15
-76181
lines changed

CMakeLists.txt

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,18 @@ get_version_number("version.txt" PressioTutorials_VERSION_PATCH)
3131
set(PressioTutorials_VERSION "${PressioTutorials_VERSION_MAJOR}.${PressioTutorials_VERSION_MINOR}.${PressioTutorials_VERSION_PATCH}")
3232
message("pressio-tutorials version = ${PressioTutorials_VERSION}")
3333

34-
set(pressio_version ${CMAKE_CURRENT_SOURCE_DIR}/tpls/pressio/version.txt)
35-
get_version_number(${pressio_version} MyPressio_VERSION_MAJOR)
36-
get_version_number(${pressio_version} MyPressio_VERSION_MINOR)
37-
get_version_number(${pressio_version} MyPressio_VERSION_PATCH)
38-
message("pressio version = ${MyPressio_VERSION_MAJOR}.${MyPressio_VERSION_MINOR}.${MyPressio_VERSION_PATCH}")
34+
# Get Pressio libraries
35+
set(PRESSIO_REPOS "rom" "ops" "log")
36+
foreach(repo IN LISTS PRESSIO_REPOS)
37+
if (NOT EXISTS ${CMAKE_SOURCE_DIR}/tpls/pressio-${repo})
38+
execute_process(
39+
COMMAND git clone --branch ${PressioTutorials_VERSION}
40+
https://github.com/Pressio/pressio-${repo}.git
41+
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tpls
42+
OUTPUT_QUIET
43+
)
44+
endif()
45+
endforeach()
3946

4047
#===================================================
4148
# c++ standard

end-to-end-roms/CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ include_directories(
77
${CMAKE_CURRENT_SOURCE_DIR}/../tpls/eigen/eigen3
88
${CMAKE_CURRENT_SOURCE_DIR}/../tpls/pressio-demoapps/include
99
${CMAKE_CURRENT_SOURCE_DIR}/../tpls #this is needed to include the pressio_cmake_config.h
10-
${CMAKE_CURRENT_SOURCE_DIR}/../tpls/pressio/include
10+
${CMAKE_CURRENT_SOURCE_DIR}/../tpls/pressio-rom/include
11+
${CMAKE_CURRENT_SOURCE_DIR}/../tpls/pressio-ops/include
12+
${CMAKE_CURRENT_SOURCE_DIR}/../tpls/pressio-log/include
1113
${CMAKE_CURRENT_SOURCE_DIR}/../tpls/yaml-cpp-0.7.0/include)
1214

1315
set(exename pdaWfExe)

tpls/pressio/include/pressio/expressions.hpp

Lines changed: 0 additions & 63 deletions
This file was deleted.

tpls/pressio/include/pressio/expressions/as_diagonal_matrix.hpp

Lines changed: 0 additions & 69 deletions
This file was deleted.

tpls/pressio/include/pressio/expressions/diag.hpp

Lines changed: 0 additions & 69 deletions
This file was deleted.

tpls/pressio/include/pressio/expressions/fwd.hpp

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

Comments
 (0)