Skip to content

Commit

Permalink
Merge pull request #612 from thelfer/610-cmake-better-support-for-usi…
Browse files Browse the repository at this point in the history
…ng-tfel-as-a-cpm-dependency

610 cmake better support for using tfel as a cpm dependency
  • Loading branch information
thelfer committed Aug 21, 2024
2 parents db57d93 + 7fa18f7 commit 7f4c299
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
2 changes: 1 addition & 1 deletion bindings/python/mfront/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ mfront_python_module(_mfront mfront.cxx
VariableBoundsDescription.cxx
VariableDescription.cxx
BehaviourData.cxx
BehaviourSymmetryType
BehaviourSymmetryType.cxx
BehaviourDescription.cxx
SearchPathsHandler.cxx
GeneratorOptions.cxx
Expand Down
4 changes: 3 additions & 1 deletion cmake/modules/tfel.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
include(CMakePackageConfigHelpers)

macro(tfel_project tfel_version_major tfel_version_minor tfel_version_patch)
project("tfel")
project("tfel"
HOMEPAGE_URL "https://thelfer.github.io/tfel/web/index.html"
LANGUAGES C CXX)
set(PACKAGE_NAME "tfel")
set(VERSION "${tfel_version_major}.${tfel_version_minor}.${tfel_version_patch}")

Expand Down
4 changes: 4 additions & 0 deletions docs/web/release-notes-3.0.14.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ The page describes the new functionalities of Version 3.0.14 of the

# Issues fixed

## Issue 610 [cmake] better support for using `TFEL` as a `CPM` dependency

For more details, see <https://github.com/thelfer/tfel/issues/610>.

## Issue 605: update `octave` interface

For more details, see <https://github.com/thelfer/tfel/issues/605>.
Expand Down
6 changes: 3 additions & 3 deletions mfront/tests/models/interfaces/src/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
if(NOT WIN32)
add_library(LicosMFrontModel MODULE LicosModelInterface)
add_library(LicosMFrontModel MODULE LicosModelInterface.cxx)
target_include_directories(LicosMFrontModel
PRIVATE ${PROJECT_SOURCE_DIR}/mfront/tests/models/interfaces/include)
target_link_libraries(LicosMFrontModel
PRIVATE TFELMFront
PRIVATE MFrontLogStream
PRIVATE TFELSystem)
add_library(GerminalMFrontModel MODULE
MFrontPleiadesModelInterfaceBase
MFrontGerminalModelInterface)
MFrontPleiadesModelInterfaceBase.cxx
MFrontGerminalModelInterface.cxx)
target_include_directories(GerminalMFrontModel
PRIVATE ${PROJECT_SOURCE_DIR}/mfront/tests/models/interfaces/include)
target_link_libraries(GerminalMFrontModel
Expand Down

0 comments on commit 7f4c299

Please sign in to comment.