Skip to content

Commit

Permalink
change CMAKE_SOURCE_DIR to PROJECT_SOURCE_DIR
Browse files Browse the repository at this point in the history
  • Loading branch information
thelfer committed Aug 20, 2024
1 parent 12f0c46 commit c93cfbd
Show file tree
Hide file tree
Showing 30 changed files with 112 additions and 112 deletions.
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ if(NOT BUILD_SHARED_LIBS)
set(enable-static OFF CACHE BOOL "enable additional static libraries" FORCE)
endif()

if(EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
if(EXISTS "${PROJECT_BINARY_DIR}/conanbuildinfo.cmake")
include(${PROJECT_BINARY_DIR}/conanbuildinfo.cmake)
conan_basic_setup(NO_OUTPUT_DIRS)
set(TFEL_USES_CONAN ON)
endif(EXISTS "${CMAKE_BINARY_DIR}/conanbuildinfo.cmake")
endif(EXISTS "${PROJECT_BINARY_DIR}/conanbuildinfo.cmake")

set(CMAKE_CXX_STANDARD 20)
set(CXX_STANDARD_REQUIRED ON)
Expand Down Expand Up @@ -114,7 +114,7 @@ endif( CMAKE_SIZEOF_VOID_P EQUAL 8 )
if(NOT TFEL_GIT_HASH)
execute_process(
COMMAND git log -1 --format=%h
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
OUTPUT_VARIABLE TFEL_GIT_HASH
OUTPUT_STRIP_TRAILING_WHITESPACE)
message("Abbreviated commit hash: ${TFEL_GIT_HASH}")
Expand Down Expand Up @@ -771,8 +771,8 @@ set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "${TFEL_WEBSITE}")

#NSIS
set(CPACK_NSIS_MODIFY_PATH ON)
set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/docs/mfront.ico")
set(CPACK_NSIS_MUI_UNIICON "${CMAKE_SOURCE_DIR}/docs/mfront.ico")
set(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/docs/mfront.ico")
set(CPACK_NSIS_MUI_UNIICON "${PROJECT_SOURCE_DIR}/docs/mfront.ico")
set(CPACK_NSIS_URL_INFO_ABOUT "${TFEL_WEBSITE}")
set(CPACK_NSIS_HELP_LINK "${TFEL_WEBSITE}")
set(CPACK_NSIS_CONTACT "${PACKAGE_BUGREPORT}")
Expand Down
4 changes: 2 additions & 2 deletions bindings/python/tfel/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ if(TFEL_NUMPY_SUPPORT)
ndarray.cxx)
target_include_directories(TFELNumpySupport
PUBLIC
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/bindings/python/include>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/bindings/python/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>)
target_include_directories(TFELNumpySupport
SYSTEM
Expand Down
2 changes: 1 addition & 1 deletion cmake/modules/tfel.cmake
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
include(CMakePackageConfigHelpers)

macro(tfel_project tfel_version_major tfel_version_minor tfel_version_patch)
project("tfel")
project("tfel" LANGUAGES "C;CXX")
set(PACKAGE_NAME "tfel")
set(VERSION "${tfel_version_major}.${tfel_version_minor}.${tfel_version_patch}")

Expand Down
8 changes: 4 additions & 4 deletions docs/mfront/aster/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ ADD_CUSTOM_COMMAND(
# COMMAND BSTINPUTS=@abs_top_srcdir@/docs/tex/texmf/bibtex ${BIBTEX_COMPILER}
# ARGS -terse aster
COMMAND ${MAKEINDEX_COMPILER}
ARGS -s ${CMAKE_SOURCE_DIR}/docs/mfront/style.ist aenv.idx
ARGS -s ${PROJECT_SOURCE_DIR}/docs/mfront/style.ist aenv.idx
COMMAND ${MAKEINDEX_COMPILER}
ARGS -s ${CMAKE_SOURCE_DIR}/docs/mfront/style.ist aheaders.idx
ARGS -s ${PROJECT_SOURCE_DIR}/docs/mfront/style.ist aheaders.idx
COMMAND ${MAKEINDEX_COMPILER}
ARGS -s ${CMAKE_SOURCE_DIR}/docs/mfront/style.ist amkeys.idx
ARGS -s ${PROJECT_SOURCE_DIR}/docs/mfront/style.ist amkeys.idx
COMMAND ${MAKEINDEX_COMPILER}
ARGS -s ${CMAKE_SOURCE_DIR}/docs/mfront/style.ist atfel.idx
ARGS -s ${PROJECT_SOURCE_DIR}/docs/mfront/style.ist atfel.idx
COMMAND TEXMFHOME=@abs_top_srcdir@/docs/tex/texmf ${LATEX_COMPILER}
ARGS -interaction=batchmode
ARGS --include-directory=@abs_top_srcdir@/docs/tex/texmf/tex/latex
Expand Down
12 changes: 6 additions & 6 deletions docs/mfront/behaviours/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ ADD_CUSTOM_COMMAND(
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/behaviours.tex.in
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/annexe-orthotropie.tex.in
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/InternalNames.tex.in
DEPENDS ${CMAKE_SOURCE_DIR}/docs/mfront/glossary.tex.in
DEPENDS ${PROJECT_SOURCE_DIR}/docs/mfront/glossary.tex.in
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/behaviours.tex
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/annexe-orthotropie.tex
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/InternalNames.tex
DEPENDS ${CMAKE_BINARY_DIR}/docs/mfront/glossary.tex
DEPENDS ${PROJECT_BINARY_DIR}/docs/mfront/glossary.tex
COMMAND TEXMFHOME=@abs_top_srcdir@/docs/tex/texmf ${LATEX_COMPILER}
ARGS -interaction=batchmode
ARGS --include-directory=@abs_top_srcdir@/docs/tex/texmf/tex/latex
Expand All @@ -30,13 +30,13 @@ ADD_CUSTOM_COMMAND(
COMMAND BSTINPUTS=@abs_top_srcdir@/docs/tex/texmf/bibtex ${BIBTEX_COMPILER}
ARGS -terse behaviours
# COMMAND ${MAKEINDEX_COMPILER}
# ARGS -s ${CMAKE_SOURCE_DIR}/docs/mfront/style.ist benv.idx
# ARGS -s ${PROJECT_SOURCE_DIR}/docs/mfront/style.ist benv.idx
COMMAND ${MAKEINDEX_COMPILER}
ARGS -s ${CMAKE_SOURCE_DIR}/docs/mfront/style.ist bheaders.idx
ARGS -s ${PROJECT_SOURCE_DIR}/docs/mfront/style.ist bheaders.idx
COMMAND ${MAKEINDEX_COMPILER}
ARGS -s ${CMAKE_SOURCE_DIR}/docs/mfront/style.ist bmkeys.idx
ARGS -s ${PROJECT_SOURCE_DIR}/docs/mfront/style.ist bmkeys.idx
COMMAND ${MAKEINDEX_COMPILER}
ARGS -s ${CMAKE_SOURCE_DIR}/docs/mfront/style.ist btfel.idx
ARGS -s ${PROJECT_SOURCE_DIR}/docs/mfront/style.ist btfel.idx
COMMAND TEXMFHOME=@abs_top_srcdir@/docs/tex/texmf ${LATEX_COMPILER}
ARGS -interaction=batchmode
ARGS --include-directory=@abs_top_srcdir@/docs/tex/texmf/tex/latex
Expand Down
8 changes: 4 additions & 4 deletions docs/mfront/castem/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ ADD_CUSTOM_COMMAND(
COMMAND BSTINPUTS=@abs_top_srcdir@/docs/tex/texmf/bibtex ${BIBTEX_COMPILER}
ARGS -terse castem
COMMAND ${MAKEINDEX_COMPILER}
ARGS -s ${CMAKE_SOURCE_DIR}/docs/mfront/style.ist uenv.idx
ARGS -s ${PROJECT_SOURCE_DIR}/docs/mfront/style.ist uenv.idx
COMMAND ${MAKEINDEX_COMPILER}
ARGS -s ${CMAKE_SOURCE_DIR}/docs/mfront/style.ist uheaders.idx
ARGS -s ${PROJECT_SOURCE_DIR}/docs/mfront/style.ist uheaders.idx
COMMAND ${MAKEINDEX_COMPILER}
ARGS -s ${CMAKE_SOURCE_DIR}/docs/mfront/style.ist umkeys.idx
ARGS -s ${PROJECT_SOURCE_DIR}/docs/mfront/style.ist umkeys.idx
COMMAND ${MAKEINDEX_COMPILER}
ARGS -s ${CMAKE_SOURCE_DIR}/docs/mfront/style.ist utfel.idx
ARGS -s ${PROJECT_SOURCE_DIR}/docs/mfront/style.ist utfel.idx
COMMAND TEXMFHOME=@abs_top_srcdir@/docs/tex/texmf ${LATEX_COMPILER}
ARGS -interaction=batchmode
ARGS --include-directory=@abs_top_srcdir@/docs/tex/texmf/tex/latex
Expand Down
8 changes: 4 additions & 4 deletions docs/mfront/general/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ ADD_CUSTOM_COMMAND(
OUTPUT mfront.pdf
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/Champs.tex.in
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/mfront.tex.in
DEPENDS ${CMAKE_SOURCE_DIR}/docs/mfront/glossary.tex.in
DEPENDS ${PROJECT_SOURCE_DIR}/docs/mfront/glossary.tex.in
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/Champs.tex
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mfront.tex
DEPENDS ${CMAKE_BINARY_DIR}/docs/mfront/glossary.tex
DEPENDS ${PROJECT_BINARY_DIR}/docs/mfront/glossary.tex
COMMAND TEXMFHOME=@abs_top_srcdir@/docs/tex/texmf ${LATEX_COMPILER}
ARGS -interaction=batchmode
ARGS --include-directory=@abs_top_srcdir@/docs/tex/texmf/tex/latex
Expand All @@ -25,9 +25,9 @@ ADD_CUSTOM_COMMAND(
COMMAND BSTINPUTS=@abs_top_srcdir@/docs/tex/texmf/bibtex ${BIBTEX_COMPILER}
ARGS -terse mfront
COMMAND ${MAKEINDEX_COMPILER}
ARGS -s ${CMAKE_SOURCE_DIR}/docs/mfront/style.ist env.idx
ARGS -s ${PROJECT_SOURCE_DIR}/docs/mfront/style.ist env.idx
COMMAND ${MAKEINDEX_COMPILER}
ARGS -s ${CMAKE_SOURCE_DIR}/docs/mfront/style.ist mkeys.idx
ARGS -s ${PROJECT_SOURCE_DIR}/docs/mfront/style.ist mkeys.idx
COMMAND TEXMFHOME=@abs_top_srcdir@/docs/tex/texmf ${LATEX_COMPILER}
ARGS -interaction=batchmode
ARGS --include-directory=@abs_top_srcdir@/docs/tex/texmf/tex/latex
Expand Down
8 changes: 4 additions & 4 deletions docs/presentations/portable-behaviour/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ if(TFEL_APPEND_SUFFIX)
DESTINATION share/doc/tfel-${TFEL_SUFFIX}/web/documents/portable-behaviour
COMPONENT website
PATTERN ".svn" EXCLUDE)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/docs/html/reveal.js
install(DIRECTORY ${PROJECT_SOURCE_DIR}/docs/html/reveal.js
DESTINATION share/doc/tfel-${TFEL_SUFFIX}/web/documents/portable-behaviour
COMPONENT website
PATTERN ".svn" EXCLUDE)
Expand All @@ -29,7 +29,7 @@ if(TFEL_APPEND_SUFFIX)
DESTINATION share/doc/mfront-${TFEL_SUFFIX}/portable-behaviour
COMPONENT docs
PATTERN ".svn" EXCLUDE)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/docs/html/reveal.js
install(DIRECTORY ${PROJECT_SOURCE_DIR}/docs/html/reveal.js
DESTINATION share/doc/mfront-${TFEL_SUFFIX}/portable-behaviour
COMPONENT docs
PATTERN ".svn" EXCLUDE)
Expand All @@ -41,7 +41,7 @@ else(TFEL_APPEND_SUFFIX)
DESTINATION share/doc/tfel/web/documents/portable-behaviour
COMPONENT website
PATTERN ".svn" EXCLUDE)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/docs/html/reveal.js
install(DIRECTORY ${PROJECT_SOURCE_DIR}/docs/html/reveal.js
DESTINATION share/doc/tfel/web/documents/portable-behaviour
COMPONENT website
PATTERN ".svn" EXCLUDE)
Expand All @@ -52,7 +52,7 @@ else(TFEL_APPEND_SUFFIX)
DESTINATION share/doc/mfront/portable-behaviour
COMPONENT docs
PATTERN ".svn" EXCLUDE)
install(DIRECTORY ${CMAKE_SOURCE_DIR}/docs/html/reveal.js
install(DIRECTORY ${PROJECT_SOURCE_DIR}/docs/html/reveal.js
DESTINATION share/doc/mfront/portable-behaviour
COMPONENT docs
PATTERN ".svn" EXCLUDE)
Expand Down
16 changes: 8 additions & 8 deletions mfm-test-generator/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ mfmtg_library(MFMTestGenerator
MFMTestGeneratorFileExport.cxx)
target_include_directories(MFMTestGenerator
PUBLIC
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/mfront/include>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/mfront/include>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/mfm-test-generator/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/mfront/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/mfront/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/mfm-test-generator/include>
$<INSTALL_INTERFACE:include>)
target_link_libraries(MFMTestGenerator
PUBLIC
Expand All @@ -30,10 +30,10 @@ target_link_libraries(MFMTestGenerator
if(enable-static)
target_include_directories(MFMTestGenerator-static
PUBLIC
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/mfront/include>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/mfront/include>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/mfm-test-generator/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/mfront/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/mfront/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/mfm-test-generator/include>
$<INSTALL_INTERFACE:include>)
target_link_libraries(MFMTestGenerator-static
PUBLIC
Expand Down
2 changes: 1 addition & 1 deletion mfm/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ macro(mfm_test args mfront_library file)
# -D TEST_PROGRAM=${mfm}
# # ${PROJECT_BINARY_DIR}/mfm/src/mfm${CMAKE_EXECUTABLE_SUFFIX}
# -D TEST_ARGS=${args}
# -D MFRONT_FILE=${CMAKE_SOURCE_DIR}/mfront/tests/behaviours/${mfront_file}
# -D MFRONT_FILE=${PROJECT_SOURCE_DIR}/mfront/tests/behaviours/${mfront_file}
# -D TEST_OUTPUT=mfm-result-${MFM_TEST_ID}.txt
# -D REFERENCE_FILE=${CMAKE_CURRENT_SOURCE_DIR}/references/${file}
# -P ${CMAKE_CURRENT_SOURCE_DIR}/mfm.cmake )
Expand Down
6 changes: 3 additions & 3 deletions mfront-query/tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ macro(mfront_query_test args mfront_file file)
COMMAND ${CMAKE_COMMAND}
-D TEST_PROGRAM=$<TARGET_FILE:mfront-query>
-D TEST_ARGS=${args}
-D MFRONT_FILE=${CMAKE_SOURCE_DIR}/mfront/tests/behaviours/${mfront_file}
-D MFRONT_FILE=${PROJECT_SOURCE_DIR}/mfront/tests/behaviours/${mfront_file}
-D TEST_OUTPUT=mfront-query-result-${MFRONT_QUERY_TEST_ID}.txt
-D REFERENCE_FILE=${CMAKE_CURRENT_SOURCE_DIR}/references/${file}
-P ${CMAKE_CURRENT_SOURCE_DIR}/mfront-query.cmake
Expand All @@ -29,7 +29,7 @@ macro(mfront_query_test args mfront_file file)
COMMAND ${CMAKE_COMMAND}
-D TEST_PROGRAM=$<TARGET_FILE:mfront-query>
-D TEST_ARGS=${args}
-D MFRONT_FILE=${CMAKE_SOURCE_DIR}/mfront/tests/behaviours/${mfront_file}
-D MFRONT_FILE=${PROJECT_SOURCE_DIR}/mfront/tests/behaviours/${mfront_file}
-D TEST_OUTPUT=mfront-query-result-${MFRONT_QUERY_TEST_ID}.txt
-D REFERENCE_FILE=${CMAKE_CURRENT_SOURCE_DIR}/references/${file}
-P ${CMAKE_CURRENT_SOURCE_DIR}/mfront-query.cmake )
Expand All @@ -43,7 +43,7 @@ macro(mfront_query_test args mfront_file file)
# -D TEST_PROGRAM=${mfront_query}
# # ${PROJECT_BINARY_DIR}/mfront-query/src/mfront-query${CMAKE_EXECUTABLE_SUFFIX}
# -D TEST_ARGS=${args}
# -D MFRONT_FILE=${CMAKE_SOURCE_DIR}/mfront/tests/behaviours/${mfront_file}
# -D MFRONT_FILE=${PROJECT_SOURCE_DIR}/mfront/tests/behaviours/${mfront_file}
# -D TEST_OUTPUT=mfront-query-result-${MFRONT_QUERY_TEST_ID}.txt
# -D REFERENCE_FILE=${CMAKE_CURRENT_SOURCE_DIR}/references/${file}
# -P ${CMAKE_CURRENT_SOURCE_DIR}/mfront-query.cmake )
Expand Down
32 changes: 16 additions & 16 deletions mfront/src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ mfront_library(MFrontLogStream
MFrontLogStream.cxx)
target_include_directories(MFrontLogStream
PUBLIC
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/mfront/include>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/mfront/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>)
if(enable-static)
target_include_directories(MFrontLogStream-static
PUBLIC
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/mfront/include>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/mfront/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>)
endif(enable-static)

Expand All @@ -22,17 +22,17 @@ mfront_library(MFrontProfiling
BehaviourProfiler.cxx)
target_include_directories(MFrontProfiling
PUBLIC
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/mfront/include>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/mfront/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>)
if(UNIX AND (NOT APPLE) AND (NOT HAIKU) AND (NOT (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")))
target_link_libraries(MFrontProfiling PRIVATE rt)
endif(UNIX AND (NOT APPLE) AND (NOT HAIKU) AND (NOT (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")))
if(enable-static)
target_include_directories(MFrontProfiling-static
PUBLIC
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/mfront/include>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/mfront/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>)
if(UNIX AND (NOT APPLE) AND (NOT HAIKU) AND (NOT (CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")))
target_link_libraries(MFrontProfiling-static PRIVATE rt)
Expand All @@ -48,8 +48,8 @@ mfront_library(MTestFileGenerator
GenericBehaviourFiniteStrainMTestFileGenerator.cxx)
target_include_directories(MTestFileGenerator
PUBLIC
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/mfront/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/mfront/include>
$<INSTALL_INTERFACE:include>)
target_link_libraries(MTestFileGenerator
PUBLIC TFELMaterial
Expand All @@ -59,8 +59,8 @@ target_link_libraries(MTestFileGenerator
if(enable-static)
target_include_directories(MTestFileGenerator-static
PUBLIC
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/mfront/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/mfront/include>
$<INSTALL_INTERFACE:include>)
target_link_libraries(MTestFileGenerator-static
PUBLIC TFELMaterial
Expand Down Expand Up @@ -502,14 +502,14 @@ endif(HAVE_CYRANO)
mfront_library(TFELMFront ${TFELMFront_SOURCES})
target_include_directories(TFELMFront
PUBLIC
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/mfront/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/mfront/include>
$<INSTALL_INTERFACE:include>)
if(enable-static)
target_include_directories(TFELMFront-static
PUBLIC
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/mfront/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/mfront/include>
$<INSTALL_INTERFACE:include>)
endif(enable-static)
if(HAVE_CASTEM)
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,7 +1,7 @@
if(NOT WIN32)
add_library(LicosMFrontModel MODULE LicosModelInterface)
target_include_directories(LicosMFrontModel
PRIVATE ${CMAKE_SOURCE_DIR}/mfront/tests/models/interfaces/include)
PRIVATE ${PROJECT_SOURCE_DIR}/mfront/tests/models/interfaces/include)
target_link_libraries(LicosMFrontModel
PRIVATE TFELMFront
PRIVATE MFrontLogStream
Expand All @@ -10,15 +10,15 @@ if(NOT WIN32)
MFrontPleiadesModelInterfaceBase
MFrontGerminalModelInterface)
target_include_directories(GerminalMFrontModel
PRIVATE ${CMAKE_SOURCE_DIR}/mfront/tests/models/interfaces/include)
PRIVATE ${PROJECT_SOURCE_DIR}/mfront/tests/models/interfaces/include)
target_link_libraries(GerminalMFrontModel
PRIVATE TFELMFront
PRIVATE MFrontLogStream
PRIVATE TFELSystem)
add_library(PleiadesModelInterface-2.0 MODULE
PleiadesModelInterface-2.0.cxx)
target_include_directories(PleiadesModelInterface-2.0
PRIVATE ${CMAKE_SOURCE_DIR}/mfront/tests/models/interfaces/include)
PRIVATE ${PROJECT_SOURCE_DIR}/mfront/tests/models/interfaces/include)
target_link_libraries(PleiadesModelInterface-2.0
PRIVATE TFELMFront
PRIVATE MFrontLogStream
Expand Down
Loading

0 comments on commit c93cfbd

Please sign in to comment.