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

Jump to bottom

Update CMakeLists handling of .mod files #109

Merged
merged 1 commit into from
Jan 14, 2020
Merged

Update CMakeLists handling of .mod files #109

merged 1 commit into from
Jan 14, 2020

Conversation

nncarlson
Copy link
Member

This resolves the issue @certik noted in #108 with the NAG compiler not finding the .mod files. It's unclear to me why things worked with other compilers, as this change is not NAG-specific at all.

This also handles installation of the .mod files (or whatever the compiler creates) which was missing before. One question is where the .mod files should be installed. This installs them into include, but it is arguably better to install them alongside the library file in the lib directory.

I've tested this with Intel and NAG (temporarily using the workarounds from #108).

@nncarlson nncarlson mentioned this pull request Jan 14, 2020
Open
certik
certik approved these changes Jan 14, 2020
View reviewed changes
Copy link
Member

@certik certik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks Neil!

@certik certik requested a review from scivision January 14, 2020 06:15
@certik
Copy link
Member

certik commented Jan 14, 2020

@scivision can you please also review this? You were the one who implemented CMAKE_Fortran_MODULE_DIRECTORY as part of #51.

@scivision
Copy link
Member

This is a nice programmatic way to do this, using the CMake generators.

@certik certik merged commit dc7e49b into fortran-lang:master Jan 14, 2020
@certik
Copy link
Member

certik commented Jan 14, 2020

Thanks for the review @scivision and thanks for the fix @nncarlson.

jvdp1 added a commit to jvdp1/stdlib that referenced this pull request Jan 21, 2020
@jvdp1
Addition of stdlib_experimental_stats function mean
d1d665b 
Squashed commit of the following:

commit 3266163
Merge: e96c12d 4274f0d
Author: Vandenplas, Jeremie <[email protected]>
Date:   Tue Jan 21 20:47:32 2020 +0100

    modification of CMake and Makefile

    Merge branch 'stat_cmake' into stat_dev

commit 4274f0d
Author: Vandenplas, Jeremie <[email protected]>
Date:   Tue Jan 21 20:44:24 2020 +0100

    stat_cmake: update Makefile

commit 17e3d16
Author: Vandenplas, Jeremie <[email protected]>
Date:   Tue Jan 21 20:35:19 2020 +0100

    second try cmake

commit 397eb18
Author: Vandenplas, Jeremie <[email protected]>
Date:   Tue Jan 21 20:18:37 2020 +0100

    Modifications of CMake for tests on Ubuntu 7

commit e96c12d
Author: Vandenplas, Jeremie <[email protected]>
Date:   Tue Jan 21 19:40:05 2020 +0100

    small change in md

commit 7eec9ae
Author: Vandenplas, Jeremie <[email protected]>
Date:   Tue Jan 21 19:37:06 2020 +0100

    stat_dev: renamed stat to stats

commit 8199b6d
Author: Vandenplas, Jeremie <[email protected]>
Date:   Tue Jan 21 19:26:20 2020 +0100

    stat_dev: changed spec

commit b1c481d
Author: Vandenplas, Jeremie <[email protected]>
Date:   Tue Jan 21 19:15:25 2020 +0100

    stat_dev: modifs following comments

commit e64657c
Author: Vandenplas, Jeremie <[email protected]>
Date:   Tue Jan 21 14:23:59 2020 +0100

    stat_dev: addition of .md file for mean

commit ad504e8
Merge: 5a1adcb bab50e3
Author: Vandenplas, Jeremie <[email protected]>
Date:   Tue Jan 21 13:16:21 2020 +0100

    Merge remote-tracking branch 'jvdp1/stat_dev_1' into stat_dev

commit bab50e3
Author: Vandenplas, Jeremie <[email protected]>
Date:   Tue Jan 21 13:13:00 2020 +0100

    stat_dev_1: changed all to iterations

commit 8d4c11f
Author: Vandenplas, Jeremie <[email protected]>
Date:   Tue Jan 21 10:31:26 2020 +0100

    stat_dev_1:moved all calls to mean functions to loops

commit 922e523
Author: Vandenplas, Jeremie <[email protected]>
Date:   Tue Jan 21 09:13:10 2020 +0100

    stat_dev_1: update test_mean

commit 5a1adcb
Author: Vandenplas, Jeremie <[email protected]>
Date:   Mon Jan 20 23:55:15 2020 +0100

    stat_dev: inverting loops for efficiency

commit 86970ae
Author: Vandenplas, Jeremie <[email protected]>
Date:   Mon Jan 20 22:54:55 2020 +0100

    stat_dev: use specific interface

commit 6574a67
Author: Vandenplas, Jeremie <[email protected]>
Date:   Mon Jan 20 22:36:33 2020 +0100

    stat_dev: addition of calls to error_stop

commit e98090b
Author: Vandenplas, Jeremie <[email protected]>
Date:   Mon Jan 20 21:32:27 2020 +0100

    stat_dev: extension to rank 15

commit e0e3092
Author: Vandenplas, Jeremie <[email protected]>
Date:   Mon Jan 20 12:46:44 2020 +0100

    stat_dev: simplified merge

commit 22ff6e4
Author: Vandenplas, Jeremie <[email protected]>
Date:   Mon Jan 20 10:38:41 2020 +0100

    stat_dev: progress rank 3

commit 7612613
Author: Vandenplas, Jeremie <[email protected]>
Date:   Mon Jan 20 10:34:06 2020 +0100

    stat_dev: add rank 3

commit 60ab523
Author: Vandenplas, Jeremie <[email protected]>
Date:   Sun Jan 19 22:14:51 2020 +0100

    stat_dev: addition of integer cases

commit 6fb6ca5
Author: Vandenplas, Jeremie <[email protected]>
Date:   Sun Jan 19 21:03:46 2020 +0100

    stat_dev: avoid allocatable functions

commit a1c6353
Author: Vandenplas, Jeremie <[email protected]>
Date:   Sun Jan 19 20:11:49 2020 +0100

    modification to have the same behaviour as Fortran sum

commit 72500e1
Author: Vandenplas, Jeremie <[email protected]>
Date:   Sun Jan 19 15:23:34 2020 +0100

    stat_dev: add error_stop

commit 1272574
Author: Vandenplas, Jeremie <[email protected]>
Date:   Sun Jan 19 15:02:52 2020 +0100

    stat_dev: update Makefile

commit 426d43f
Author: Vandenplas, Jeremie <[email protected]>
Date:   Sun Jan 19 12:21:09 2020 +0100

    stat_dev: addition of test and creation of modules and submodules with fypp

    how to use pure functions inside submodules

commit 965f37b
Author: Vandenplas, Jeremie <[email protected]>
Date:   Sun Jan 19 11:35:11 2020 +0100

    moved to submodules

    how to use pure functions in submodules

commit d9af336
Author: Vandenplas, Jeremie <[email protected]>
Date:   Sun Jan 19 11:22:52 2020 +0100

    stat_dev: init

commit dc7e49b
Merge: f300f4a cb7cf71
Author: Ondřej Čertík <[email protected]>
Date:   Tue Jan 14 11:11:12 2020 -0700

    Merge pull request fortran-lang#109 from nncarlson/target-include

    Update CMakeLists handling of .mod files

commit cb7cf71
Author: Neil Carlson <[email protected]>
Date:   Mon Jan 13 16:38:12 2020 -0700

    Update CMakeLists handling of .mod files

commit f300f4a
Merge: 12bd060 0ea0ee1
Author: Milan Curcic <[email protected]>
Date:   Wed Jan 8 18:20:09 2020 -0500

    Merge pull request fortran-lang#54 from scivision/systemlib

    add system module

commit 0ea0ee1
Author: Michael Hirsch, Ph.D <[email protected]>
Date:   Mon Jan 6 11:41:46 2020 -0500

    make sleep test automated check with system_clock

commit c8974dc
Author: Michael Hirsch, Ph.D <[email protected]>
Date:   Mon Dec 30 16:20:55 2019 -0500

    add system module

    There are a number of capabilities it would be useful to bring from
    cstdlib and STL. This is an initial demonstration, replacing
    the non-cross-compiler sleep() with a standard implmeentation that
    works across compilers and operating systems, with millisecond integer
    input.

commit 12bd060
Merge: 006beda e1d861d
Author: Ondřej Čertík <[email protected]>
Date:   Wed Jan 8 11:52:06 2020 -0700

    Merge pull request fortran-lang#97 from certik/goals

    Add Goals and Motivation section into README

commit e1d861d
Author: Ondřej Čertík <[email protected]>
Date:   Wed Jan 8 10:00:27 2020 -0700

    Update README.md

commit ca4554a
Author: Ondřej Čertík <[email protected]>
Date:   Wed Jan 8 09:49:39 2020 -0700

    Add Goals and Motivation section into README

commit 006beda
Merge: 1926ade e81d295
Author: Ondřej Čertík <[email protected]>
Date:   Tue Jan 7 15:41:39 2020 -0700

    Merge pull request fortran-lang#94 from certik/workflow

    Document workflow based on the discussion in #5

commit e81d295
Author: Ondřej Čertík <[email protected]>
Date:   Tue Jan 7 08:20:24 2020 -0700

    Update the workflow based on feedback

commit 1926ade
Merge: 7a6108e f857482
Author: Ondřej Čertík <[email protected]>
Date:   Tue Jan 7 08:01:39 2020 -0700

    Merge pull request fortran-lang#96 from nshaffer/dev-optval

    Make optval pure or pure elemental where possible

commit f857482
Merge: 274a2bb 7a6108e
Author: Ondřej Čertík <[email protected]>
Date:   Tue Jan 7 07:48:17 2020 -0700

    Merge branch 'master' into dev-optval

commit 274a2bb
Author: Nathaniel Shaffer <[email protected]>
Date:   Tue Jan 7 07:00:21 2020 -0700

    add tests for 1d arrays (reals, ints, logical)

commit e06e322
Author: Nathaniel Shaffer <[email protected]>
Date:   Tue Jan 7 06:58:14 2020 -0700

    add "elemental" and/or "pure" attributes where possible

commit 92926e0
Author: Ondřej Čertík <[email protected]>
Date:   Mon Jan 6 15:01:31 2020 -0700

    Make the specification requirement part of step 3.

commit 1f56d0d
Author: Ondřej Čertík <[email protected]>
Date:   Mon Jan 6 12:09:48 2020 -0700

    Document workflow based on the discussion in #5

commit 7a6108e
Merge: e2b0cda a606606
Author: Izaak "Zaak" Beekman <[email protected]>
Date:   Mon Jan 6 13:02:55 2020 -0500

    ci ctest enhancements (fortran-lang#92)

    Merge [scivision:citime] into master

    [scivision:citime]: https://github.com/scivision/stdlib/tree/citime

commit a606606
Author: Michael Hirsch, Ph.D <[email protected]>
Date:   Mon Jan 6 11:50:17 2020 -0500

    ci ctest enhancements

commit e2b0cda
Merge: 57d99f8 f0a6886
Author: Ondřej Čertík <[email protected]>
Date:   Mon Jan 6 08:01:24 2020 -0700

    Merge pull request fortran-lang#90 from certik/stream

    Use access = "stream" by default

commit f0a6886
Author: Ondřej Čertík <[email protected]>
Date:   Mon Jan 6 07:56:18 2020 -0700

    Update src/stdlib_experimental_io.f90

    Co-Authored-By: Jeremie Vandenplas <[email protected]>

commit 05540fd
Author: Ondřej Čertík <[email protected]>
Date:   Mon Jan 6 07:52:24 2020 -0700

    Use access = "stream" by default

commit 57d99f8
Merge: c3e4816 d845f2d
Author: Ondřej Čertík <[email protected]>
Date:   Mon Jan 6 07:42:42 2020 -0700

    Merge pull request fortran-lang#89 from pdebuyl/qsavetxt_format_string

    Use explicit formatting in qsavetxt

commit d845f2d
Author: Pierre de Buyl <[email protected]>
Date:   Mon Jan 6 10:35:55 2020 +0100

    Use explicit formatting in qsavetxt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@scivision scivision scivision approved these changes

@certik certik certik approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@nncarlson @certik @scivision