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

Configure and install version file when building in Trilinos #2957

Merged
merged 1 commit into from
Apr 16, 2020
Merged

Configure and install version file when building in Trilinos #2957

merged 1 commit into from
Apr 16, 2020

Conversation

aprokop
Copy link
Collaborator

@aprokop aprokop commented Apr 16, 2020

This is a fix to install version file to address the missing part in #2779.

@dalg24-jenkins
Copy link
Collaborator

Can one of the admins verify this patch?

@dalg24
Copy link
Member

dalg24 commented Apr 16, 2020

OK to test

@dalg24 dalg24 requested a review from jjwilke April 16, 2020 13:31
COMPATIBILITY SameMajorVersion)

install(FILES ${CMAKE_CURRENT_BINARY_DIR}/KokkosConfigVersion.cmake
DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/cmake/${PACKAGE_NAME}")
Copy link
Member

Choose a reason for hiding this comment

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

@bartlettroscoe please confirm this is the right way to deduce the destination

Copy link
Contributor

Choose a reason for hiding this comment

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

This looks like the correct location.

NOTE: As I mentioned here, TriBITS may need to create this file as well in order to prefer finding "standard compliant" packages.

@bartlettroscoe
Copy link
Contributor

When building inside of Trilinos, the various <Package>Config.cmake files get generated automatically. There should be no code in Kokkos itself that does this.

NOTE: We will be updating what these <Package>Config.cmake files look like as part of TriBITSPub/TriBITS#63 and TriBITSPub/TriBITS#299. The plan is to devote a lot of time starting in May to that work.

We are also working on a standard for these <Package>Config.cmake files in:

@crtrott
Copy link
Member

crtrott commented Apr 16, 2020

@bartlettroscoe this is not doing anything with KokkosConfig.cmake it only adds a Version.cmake file

@dalg24
Copy link
Member

dalg24 commented Apr 16, 2020

We are also working on a standard for these <Package>Config.cmake files in:

I don't have the right permissions to see that page

@bartlettroscoe
Copy link
Contributor

I don't have the right permissions to see that page

@dalg24, can you contact me offline and I will see about getting you access to that site?

@bartlettroscoe
Copy link
Contributor

this is not doing anything with KokkosConfig.cmake it only adds a Version.cmake file

@crtrott, okay. But as part of addressing TriBITSPub/TriBITS#63, we may need to write a specialized <Package>ConfigVersion.cmake file to get that system to work (to differentiate standard compatible packages from non-standard compatible packages).

@kokkos kokkos deleted a comment from bartlettroscoe Apr 16, 2020
Copy link
Contributor

@masterleinad masterleinad left a comment

Choose a reason for hiding this comment

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

I can confirm that this works.

@jjwilke
Copy link

jjwilke commented Apr 16, 2020

This looks fine as a fix for now.

@dalg24 dalg24 merged commit 7c1ab6c into kokkos:develop Apr 16, 2020
@aprokop aprokop deleted the install_trilinos_version branch April 16, 2020 17:56
@sethrj
Copy link

sethrj commented May 1, 2020

Another argument for Trilinos as a TPL (see TriBITSPub/TriBITS#63) and kokkos as a TPL as well. SCALE/VERA/MPACT (for example) can't use on any projects that require also require Trilinos or Kokkos.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants