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.

Sign up for GitHub

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

Support a modular approach to cinch #65

Merged
merged 11 commits into from
May 8, 2017
Merged

Support a modular approach to cinch #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4fb8ad2
reorganize cinch, removing make info
Apr 27, 2017
3740be8
More reorganization of cinch
Apr 27, 2017
9fe5123
modular cinch interface and full-fledged interface can now coexist
May 7, 2017
fc27c36
Merge remote-tracking branch 'origin/master' into reorg
May 7, 2017
c974f95
tweak to get nested projects to work
May 7, 2017
bcaa0da
Removed hardcoded pfunit path
May 7, 2017
3be6e2f
cleaned up some duplication
May 7, 2017
6db60bb
reused some duplicated code
May 8, 2017
b72da86
updated copyright info
May 8, 2017
d12e0de
Merge remote-tracking branch 'origin/master' into reorg
May 8, 2017
816f7e6
travis: re-enable flecsi test
junghans May 8, 2017
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
5 changes: 2 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ addons:
- cmake
- cmake-data
- libopenmpi-dev
# - libcereal-dev
- openmpi-bin
- gcc-4.9
- g++-4.9
Expand All @@ -35,8 +34,8 @@ env: #maybe add mpich later
- MPI=OFF TEST=laristra/cinch-nested-example
- MPI=ON TEST=losalamos/vpic
- MPI=OFF TEST=losalamos/vpic
# - MPI=ON TEST=laristra/flecsi GVER=5
# - MPI=OFF TEST=laristra/flecsi GVER=5
- MPI=ON TEST=laristra/flecsi GVER=5
- MPI=OFF TEST=laristra/flecsi GVER=5

script:
- git checkout -b cinch_current_commit
Expand Down
6 changes: 1 addition & 5 deletions cmake/PFUnitLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,7 @@ set_target_properties(pfunit
set_target_properties(pfunit
PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/pfunit/generated)

if(BUILD_SHARED_LIBS)
set(PFUNIT_LIBRARY ${CMAKE_BINARY_DIR}/pfunit/lib/libpfunit.so)
else()
set(PFUNIT_LIBRARY ${CMAKE_BINARY_DIR}/pfunit/lib/libpfunit.a)
endif(BUILD_SHARED_LIBS)
set(PFUNIT_LIBRARY pfunit)

set(PFUNIT_INCLUDE_DIR ${CMAKE_BINARY_DIR}/pfunit/include)
set(PFUNIT_DRIVER ${CMAKE_SOURCE_DIR}/cinch/pfunit/include/driver.F90)
Expand Down
Loading