Skip to content

Commit 6bdae09

Browse files
committed
make MGIS CPM friendly
1 parent 270c0ee commit 6bdae09

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ endif(enable-doxygen-doc OR enable-website)
229229

230230
# add a target to generate API documentation with Doxygen
231231
if(enable-doxygen-doc)
232-
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/docs)
232+
file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/docs)
233233
find_package(Doxygen)
234234
if(DOXYGEN_FOUND)
235235
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in
@@ -296,7 +296,7 @@ add_subdirectory(bindings)
296296
if(MFrontGenericInterfaceSupportDevelopmentVersion)
297297
set(CPACK_PACKAGE_VERSION_PATCH "${CMAKE_PROJECT_VERSION_PATCH}-dev")
298298
endif()
299-
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LGPL-3.0.txt")
299+
set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LGPL-3.0.txt")
300300
set(CPACK_VERBATIM_VARIABLES YES)
301301
if(NOT CPACK_SOURCE_GENERATOR)
302302
set(CPACK_SOURCE_GENERATOR "TGZ")

Doxyfile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ PROJECT_LOGO =
5858
# entered, it will be relative to the location where doxygen was started. If
5959
# left blank the current directory will be used.
6060

61-
OUTPUT_DIRECTORY = @CMAKE_BINARY_DIR@/docs/doxygen
61+
OUTPUT_DIRECTORY = @PROJECT_BINARY_DIR@/docs/doxygen
6262

6363
# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
6464
# directories (in 2 levels) under the output directory of each output format and

bindings/fortran/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ mgis_library(MFrontGenericInterface-fortran
44
mgis_behaviour.f95
55
mgis_model.f95)
66
set_target_properties(MFrontGenericInterface-fortran
7-
PROPERTIES Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/bindings/fortran/modules")
7+
PROPERTIES Fortran_MODULE_DIRECTORY "${PROJECT_BINARY_DIR}/bindings/fortran/modules")
88
target_include_directories(MFrontGenericInterface-fortran
99
PRIVATE "${PROJECT_SOURCE_DIR}/include"
1010
PRIVATE "${PROJECT_SOURCE_DIR}/bindings/c/include")

bindings/fortran/tests/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ add_library(MFrontGenericInterfaceFortranUnitTestingUtilities
66
mgis_testing_utilities.f95
77
mgis_testing_utilities.c)
88
target_include_directories(MFrontGenericInterfaceFortranUnitTestingUtilities
9-
PRIVATE "${CMAKE_BINARY_DIR}/bindings/fortran/modules")
9+
PRIVATE "${PROJECT_BINARY_DIR}/bindings/fortran/modules")
1010
target_link_libraries(MFrontGenericInterfaceFortranUnitTestingUtilities
1111
PRIVATE MFrontGenericInterface-fortran)
1212

1313
function(test_fortran_bindings test)
1414
add_executable(${test}_f
1515
EXCLUDE_FROM_ALL ${test}.f95)
1616
target_include_directories(${test}_f
17-
PRIVATE "${CMAKE_BINARY_DIR}/bindings/fortran/modules")
17+
PRIVATE "${PROJECT_BINARY_DIR}/bindings/fortran/modules")
1818
target_link_libraries(${test}_f
1919
PRIVATE MFrontGenericInterface-fortran MFrontGenericInterfaceFortranUnitTestingUtilities)
2020
if(CMAKE_CONFIGURATION_TYPES)

0 commit comments

Comments
 (0)