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

merge #18

Merged
merged 33 commits into from
Jan 22, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
36f9abe
Revert "Update stdlib_ascii.f90"
arjenmarkus Sep 16, 2020
e170a75
Revert "Update stdlib_ascii.f90"
arjenmarkus Sep 16, 2020
c371a16
Merge branch 'master' of https://github.com/fortran-lang/stdlib
arjenmarkus Dec 18, 2020
65eb03c
Merge branch 'master' of https://github.com/fortran-lang/stdlib
arjenmarkus Dec 22, 2020
51bedb4
Merge branch 'master' of https://github.com/fortran-lang/stdlib
arjenmarkus Dec 31, 2020
0c50e78
Fix subproject build (#284)
awvwgk Jan 5, 2021
ece1971
Write a more verbose introduction to building stdlib
awvwgk Jan 7, 2021
c9f3195
Apply suggested wording and spelling changes
awvwgk Jan 8, 2021
04baf58
Fix dependencies in manual makefile
awvwgk Jan 8, 2021
de8fa70
Fix typo and missing dependency from stdlib_stats to stdlib_kinds
awvwgk Jan 8, 2021
84e9adf
Add dependency from stdlib_linalg to stdlib_kinds
awvwgk Jan 8, 2021
67cd8bf
Add list of supported compilers/platforms/architectures
awvwgk Jan 9, 2021
25cbd1a
Add Windows i686 test failure with GCC 7.4 to README
awvwgk Jan 11, 2021
dc0ba16
Follow GNU install conventions
awvwgk Jan 6, 2021
c2a1957
Merge pull request #293 from awvwgk/readme
milancurcic Jan 14, 2021
f4f6045
Rename CMake project from stdlib to fortran_stdlib (#290)
awvwgk Jan 15, 2021
c0b86d5
Generate package file exports with CMake
awvwgk Jan 6, 2021
26a1311
Account for prerelease version and different API compatibility
awvwgk Jan 8, 2021
2612d45
Clean generated .f90 files with make
jvdp1 Jan 17, 2021
3e988de
add dependency to common.fypp
jvdp1 Jan 17, 2021
7ef70a0
Fix typos in README
awvwgk Jan 17, 2021
2381809
Update src/Makefile.manual
jvdp1 Jan 17, 2021
d7746e2
Merge pull request #291 from awvwgk/export-package-files
jvdp1 Jan 18, 2021
c696dcb
Merge pull request #294 from awvwgk/fix-makefile
milancurcic Jan 18, 2021
2cc2004
Merge pull request #301 from jvdp1/fix_makefile
milancurcic Jan 18, 2021
1c0f99a
fix missing dependencies
jvdp1 Jan 18, 2021
e2c6e06
Merge pull request #303 from jvdp1/make_parallel
milancurcic Jan 18, 2021
3a6f26f
Merge pull request #9 from fortran-lang/master
Jim-215-Fisher Jan 19, 2021
3e89cdc
Update Makefile.manual
Jim-215-Fisher Jan 21, 2021
9117db8
Merge branch 'master' of https://github.com/fortran-lang/stdlib
arjenmarkus Jan 21, 2021
349d0eb
Merge pull request #14 from fortran-lang/master
Jim-215-Fisher Jan 21, 2021
c7cf916
Update CMakeLists.txt
Jim-215-Fisher Jan 22, 2021
ba70104
Update CMakeLists.txt
Jim-215-Fisher Jan 22, 2021
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
Prev Previous commit
Next Next commit
Follow GNU install conventions
- allow customization of install locations by GNUInstallDirs module
- enable project installation on CI testing
  • Loading branch information
awvwgk committed Jan 11, 2021
commit dc0ba16d1d449579ebf040ecf344232b5320bcb3
20 changes: 18 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,12 @@ jobs:
brew link gcc@${GCC_V}

- name: Configure with CMake
run: cmake -Wdev -DCMAKE_BUILD_TYPE=Release -DCMAKE_MAXIMUM_RANK=4 -S . -B build
run: >-
cmake -Wdev
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_MAXIMUM_RANK=4
-DCMAKE_INSTALL_PREFIX=$PWD/_dist
-S . -B build

- name: Build and compile
run: cmake --build build
Expand All @@ -72,6 +77,9 @@ jobs:
run: ctest --parallel --output-on-failure
working-directory: build

- name: Install project
run: cmake --install build

- name: Test in-tree builds
if: contains( matrix.gcc_v, '10') # Only test one compiler on each platform
run: |
Expand Down Expand Up @@ -129,7 +137,12 @@ jobs:
run: pip install --upgrade fypp

- name: Configure with CMake
run: cmake -Wdev -DCMAKE_BUILD_TYPE=Release -DCMAKE_MAXIMUM_RANK=4 -S . -B build
run: >-
cmake -Wdev
-DCMAKE_BUILD_TYPE=Release
-DCMAKE_MAXIMUM_RANK=4
-DCMAKE_INSTALL_PREFIX=$PWD/_dist
-S . -B build

- name: Build and compile
run: cmake --build build
Expand All @@ -141,3 +154,6 @@ jobs:
- name: test
run: ctest --parallel --output-on-failure
working-directory: build

- name: Install project
run: cmake --install build
4 changes: 4 additions & 0 deletions .github/workflows/ci_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ jobs:
-DCMAKE_BUILD_TYPE=Debug
-DCMAKE_Fortran_FLAGS_DEBUG="-Wall -Wextra -Wimplicit-interface -fPIC -g -fcheck=all -fbacktrace"
-DCMAKE_MAXIMUM_RANK=4
-DCMAKE_INSTALL_PREFIX=$PWD/_dist
env:
FC: gfortran
CC: gcc
Expand All @@ -120,3 +121,6 @@ jobs:
with:
name: WindowsCMakeTestlog
path: build/Testing/Temporary/LastTest.log

- name: Install project
run: cmake --install build
5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ cmake_minimum_required(VERSION 3.14.0)
project(stdlib Fortran)
enable_testing()

# Follow GNU conventions for installation directories
include(GNUInstallDirs)

include(${PROJECT_SOURCE_DIR}/cmake/stdlib.cmake)

# --- compiler options
Expand Down Expand Up @@ -55,5 +58,5 @@ add_subdirectory(src)

install(EXPORT fortran_stdlib-targets
NAMESPACE fortran_stdlib::
DESTINATION "lib/cmake/fortran_stdlib"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/fortran_stdlib"
)
8 changes: 4 additions & 4 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,8 @@ add_subdirectory(tests)

install(TARGETS fortran_stdlib
EXPORT fortran_stdlib-targets
RUNTIME DESTINATION bin
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
)
install(DIRECTORY ${LIB_MOD_DIR} DESTINATION include)
install(DIRECTORY ${LIB_MOD_DIR} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")