Skip to content

Commit 09d8502

Browse files
committed
simplify link statement. Don't override cache.
1 parent e232c30 commit 09d8502

File tree

4 files changed

+24
-21
lines changed

4 files changed

+24
-21
lines changed

CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,16 +44,16 @@ endif()
4444
# --- build
4545

4646
add_library(nc4fortran)
47-
target_include_directories(nc4fortran
48-
PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/include # for IBM XL
49-
INTERFACE
50-
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
51-
$<INSTALL_INTERFACE:include>)
47+
target_include_directories(nc4fortran PUBLIC
48+
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>
49+
$<INSTALL_INTERFACE:include>
50+
)
5251
target_link_libraries(nc4fortran PUBLIC NetCDF::NetCDF_Fortran)
5352
set_target_properties(nc4fortran PROPERTIES
54-
Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include
55-
LABELS core
56-
VERSION ${PROJECT_VERSION})
53+
Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include
54+
LABELS core
55+
VERSION ${PROJECT_VERSION}
56+
)
5757

5858
# GLOBAL needed for FetchContent use
5959
add_library(nc4fortran::nc4fortran INTERFACE IMPORTED GLOBAL)

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.5
1+
1.4.6

cmake/install.cmake

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,25 @@
33
include(CMakePackageConfigHelpers)
44

55
configure_package_config_file(${CMAKE_CURRENT_LIST_DIR}/config.cmake.in
6-
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config.cmake
7-
INSTALL_DESTINATION cmake)
6+
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config.cmake
7+
INSTALL_DESTINATION cmake
8+
)
89

910
write_basic_package_version_file(
10-
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config-version.cmake
11-
COMPATIBILITY SameMinorVersion)
11+
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config-version.cmake
12+
COMPATIBILITY SameMinorVersion
13+
)
1214

1315
install(EXPORT ${PROJECT_NAME}-targets
14-
NAMESPACE ${PROJECT_NAME}::
15-
DESTINATION cmake)
16+
NAMESPACE ${PROJECT_NAME}::
17+
DESTINATION cmake
18+
)
1619

1720
install(FILES
18-
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config.cmake
19-
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config-version.cmake
20-
DESTINATION cmake)
21+
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config.cmake
22+
${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${PROJECT_NAME}-config-version.cmake
23+
DESTINATION cmake
24+
)
2125

2226
# --- CPack
2327

@@ -37,6 +41,7 @@ string(REGEX REPLACE "\n" ";" _cpack_ignore ${_cpack_ignore})
3741
set(CPACK_SOURCE_IGNORE_FILES "${_cpack_ignore}")
3842

3943
install(FILES ${CPACK_RESOURCE_FILE_README} ${CPACK_RESOURCE_FILE_LICENSE}
40-
DESTINATION share/docs/${PROJECT_NAME})
44+
DESTINATION share/docs/${PROJECT_NAME}
45+
)
4146

4247
include(CPack)

cmake/options.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
2-
option(netcdf_external "Build NetCDF4 library")
31
option(dev "developer mode")
42

53
set(CMAKE_EXPORT_COMPILE_COMMANDS true)

0 commit comments

Comments
 (0)