Create dealii::dealii target and add compile options #14971
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@masterleinad I now have When I look into the installed deal.IITargets.cmake, I see which doesn't look quite right. |
|
@sebproell With the latest commit, we now do # Create imported target dealii::dealii
add_library(dealii::dealii INTERFACE IMPORTED)
set_target_properties(dealii::dealii PROPERTIES
INTERFACE_LINK_LIBRARIES "\$<\$<CONFIG:Debug>:dealii::dealii_debug>;\$<\$<CONFIG:>:dealii::dealii_debug>;\$<\$<CONFIG:Release>:dealii::dealii_release>"
) |
|
/rebuild |
masterleinad
force-pushed
the
dealii_dealii_target
branch
from
1fd6bc7
to
fa68000
Compare
|
@masterleinad I am currently running the FE Rodeo. Would you mind to give me 48h to think about this approach. In general I think it is neat to introduce a |
This comment was marked as outdated.
This comment was marked as outdated.
Sorry, something went wrong.
|
@sebproell For the time being |
tamiko
requested changes
Mar 30, 2023
masterleinad
force-pushed
the
dealii_dealii_target
branch
from
eafcbb2
to
6f95b96
Compare
tamiko
requested changes
Mar 30, 2023
source/CMakeLists.txt
Outdated
| @@ -127,6 +142,24 @@ foreach(build ${DEAL_II_BUILD_TYPES}) | |||
| RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/${DEAL_II_EXECUTABLE_RELDIR}" | |||
| ) | |||
|
|
|||
| separate_arguments(_compile_options UNIX_COMMAND | |||
| "${DEAL_II_CXX_FLAGS_${build_uppercase}}" | |||
There was a problem hiding this comment.
Suggested change
| "${DEAL_II_CXX_FLAGS_${build_uppercase}}" | |
| "${DEAL_II_CXX_FLAGS_${build}}" |
source/CMakeLists.txt
Outdated
| foreach(build ${DEAL_II_BUILD_TYPES}) | ||
| string(TOLOWER ${build} build_lowercase) | ||
| string(TOUPPER ${build} build_uppercase) |
There was a problem hiding this comment.
Suggested change
| string(TOUPPER ${build} build_uppercase) | |
| if("${build}" matches "DEBUG") | |
| set(build_camelcase "Debug") | |
| elseif("${build}" matches "RELEASE") | |
| set(build_camelcase "Release") | |
| endif() |
The ${build} variable is already uppercase.
There was a problem hiding this comment.
Hmm... I'm pretty sure I needed that initially but I can confirm that ${build} is uppercase indeed.
tamiko
approved these changes
Mar 30, 2023
|
@masterleinad Would you mind to squash the reverts? |
masterleinad
force-pushed
the
dealii_dealii_target
branch
from
34bd5d0
to
a82dd4c
Compare
I just squashed everything. |
tamiko
added a commit
to tamiko/dealii
that referenced
this pull request
Mar 31, 2023
We had an unfortunate "in flight" renaming conflict: One pull request renamed the variable to DEAL_II_TARGET_NAME (PR dealii#14993) while another one (PR dealii#14971) created the dealii::dealii target. Both on their own passed the CI, but once both were merged we have an issue. In reference to dealii#14971 In reference to dealii#14993
tamiko
added a commit
to tamiko/dealii
that referenced
this pull request
Mar 31, 2023
We had an unfortunate "in flight" renaming conflict: One pull request renamed the variable to DEAL_II_TARGET_NAME (PR dealii#14993) while another one (PR dealii#14971) created the dealii::dealii target. Both on their own passed the CI, but once both were merged we have an issue. In reference to dealii#14971 In reference to dealii#14993
mschreter
pushed a commit
to mschreter/dealii
that referenced
this pull request
Apr 2, 2023
We had an unfortunate "in flight" renaming conflict: One pull request renamed the variable to DEAL_II_TARGET_NAME (PR dealii#14993) while another one (PR dealii#14971) created the dealii::dealii target. Both on their own passed the CI, but once both were merged we have an issue. In reference to dealii#14971 In reference to dealii#14993
singimarson
pushed a commit
to singimarson/dealii
that referenced
this pull request
Apr 11, 2023
We had an unfortunate "in flight" renaming conflict: One pull request renamed the variable to DEAL_II_TARGET_NAME (PR dealii#14993) while another one (PR dealii#14971) created the dealii::dealii target. Both on their own passed the CI, but once both were merged we have an issue. In reference to dealii#14971 In reference to dealii#14993
tamiko
added a commit
to tamiko/dealii
that referenced
this pull request
Apr 13, 2023
This partially reverts a82dd4c In reference to dealii#14971
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request makes it possible to use
including using
DEAL_II_CXX_FLAGS.(tamiko:) In reference to #14947