Skip to content

Commit 2a05d4b

Browse files
committed
delete project name from package config .in file
1 parent 6401d83 commit 2a05d4b

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#################################################################
1111
# HEADER
1212
#################################################################
13-
cmake_minimum_required(VERSION 3.10...3.11)
13+
cmake_minimum_required(VERSION 3.10...3.13)
1414
project(PENF VERSION 1.2.1 LANGUAGES Fortran)
1515

1616
#################################################################
@@ -70,14 +70,14 @@ export(EXPORT ${TARGETS_EXPORT_NAME}
7070

7171
#create package config
7272
include(CMakePackageConfigHelpers)
73-
configure_package_config_file(cmake/${project_config}.in ${cmake_files_dir}/${project_config}
73+
configure_package_config_file(cmake/PackageConfig.cmake.in ${cmake_files_dir}/${project_config}
7474
INSTALL_DESTINATION ${config_install_dir}
7575
)
7676
install(FILES ${cmake_files_dir}/${project_config}
7777
DESTINATION ${config_install_dir}
7878
)
7979

80-
configure_package_config_file(cmake/${project_config}.in ${config_build_dir}/${project_config}
80+
configure_package_config_file(cmake/PackageConfig.cmake.in ${config_build_dir}/${project_config}
8181
INSTALL_DESTINATION ${config_build_dir}
8282
INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}
8383
)
File renamed without changes.

src/tests/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ function(add_penf_doctest test_src libraries)
1717
string(REGEX REPLACE "([+.])([^+.]*)" "\\\\\\1\\2" result ${result_raw})
1818

1919
set_tests_properties(${test_name} PROPERTIES
20-
PASS_REGULAR_EXPRESSION "${result}")
20+
PASS_REGULAR_EXPRESSION "${result}"
21+
)
2122
endfunction()
2223

2324
file(GLOB_RECURSE penf_doctests *.f90)

0 commit comments

Comments
 (0)