From 53f3a946c1ecf2d7eb2f5e656b2b258b786b66c7 Mon Sep 17 00:00:00 2001 From: Sergey Kosukhin <sergey.kosukhin@mpimet.mpg.de> Date: Tue, 10 Dec 2024 19:41:12 +0100 Subject: [PATCH] cmake: drop seemingly redundant quotations --- CMakeLists.txt | 24 +++++++++++------------- cmake/FindCheck.cmake | 4 ++-- cmake/SearchFunctionLibrary.cmake | 4 ++-- cmake/config.cmake.in | 2 +- src/CMakeLists.txt | 8 ++++---- 5 files changed, 20 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5409b155..029365e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ option(MTIME_ENABLE_FORTRAN_HL "Enable the high-level Fortran interface" ON) option(MTIME_BUILD_EXAMPLES "Build examples" ON) option(MTIME_BUILD_DOCS "Build documentation" OFF) -list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake") +list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake) # Set line limit to none for GNU compiler (default is 132) to enable long # __FILE__ macro: @@ -45,28 +45,26 @@ if(MTIME_BUILD_DOCS) add_subdirectory(doc) endif() -export(EXPORT "mtime-targets" FILE "${PROJECT_BINARY_DIR}/mtime-targets.cmake") +export(EXPORT mtime-targets FILE ${PROJECT_BINARY_DIR}/mtime-targets.cmake) include(CMakePackageConfigHelpers) configure_package_config_file( - "${PROJECT_SOURCE_DIR}/cmake/config.cmake.in" - "${PROJECT_BINARY_DIR}/mtime-config.cmake" - INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake" + ${PROJECT_SOURCE_DIR}/cmake/config.cmake.in + ${PROJECT_BINARY_DIR}/mtime-config.cmake + INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO ) write_basic_package_version_file( - "${PROJECT_BINARY_DIR}/mtime-config-version.cmake" - VERSION "${mtime_VERSION_MAJOR}.${mtime_VERSION_MINOR}" + ${PROJECT_BINARY_DIR}/mtime-config-version.cmake + VERSION ${mtime_VERSION_MAJOR}.${mtime_VERSION_MINOR} COMPATIBILITY AnyNewerVersion ) -install( - EXPORT "mtime-targets" DESTINATION "${CMAKE_INSTALL_LIBDIR}/mtime/cmake" -) +install(EXPORT mtime-targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/mtime/cmake) install( - FILES "${PROJECT_BINARY_DIR}/mtime-config.cmake" - "${PROJECT_BINARY_DIR}/mtime-config-version.cmake" - DESTINATION "${CMAKE_INSTALL_LIBDIR}/mtime/cmake" + FILES ${PROJECT_BINARY_DIR}/mtime-config.cmake + ${PROJECT_BINARY_DIR}/mtime-config-version.cmake + DESTINATION ${CMAKE_INSTALL_LIBDIR}/mtime/cmake ) diff --git a/cmake/FindCheck.cmake b/cmake/FindCheck.cmake index c64cb3e4..88cad762 100644 --- a/cmake/FindCheck.cmake +++ b/cmake/FindCheck.cmake @@ -21,8 +21,8 @@ if(NOT TARGET Check::Interface) add_library(Check::Interface UNKNOWN IMPORTED) set_target_properties( Check::Interface - PROPERTIES IMPORTED_LOCATION "${Check_LIBRARY}" - INTERFACE_INCLUDE_DIRECTORIES "${Check_INCLUDE_DIR}" + PROPERTIES IMPORTED_LOCATION ${Check_LIBRARY} + INTERFACE_INCLUDE_DIRECTORIES ${Check_INCLUDE_DIR} ) endif() endif() diff --git a/cmake/SearchFunctionLibrary.cmake b/cmake/SearchFunctionLibrary.cmake index 5344d13a..44eb9b39 100644 --- a/cmake/SearchFunctionLibrary.cmake +++ b/cmake/SearchFunctionLibrary.cmake @@ -22,7 +22,7 @@ function(search_function_library function var_found var_library) cmake_parse_arguments(PARSE_ARGV 3 ARG "" "" "OPTIONS") - if(DEFINED "${var_found}") + if(DEFINED ${var_found}) return() endif() @@ -33,7 +33,7 @@ function(search_function_library function var_found var_library) set(CMAKE_REQUIRED_QUIET True) set(save_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}") - if(DEFINED "${var_library}") + if(DEFINED ${var_library}) set(options "${${var_library}}") else() set(options ";${ARG_OPTIONS}") diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in index 7766128d..91565473 100644 --- a/cmake/config.cmake.in +++ b/cmake/config.cmake.in @@ -5,7 +5,7 @@ @PACKAGE_INIT@ -include("${CMAKE_CURRENT_LIST_DIR}/mtime-targets.cmake") +include(${CMAKE_CURRENT_LIST_DIR}/mtime-targets.cmake) include(FindPackageHandleStandardArgs) find_package_handle_standard_args(mtime REQUIRED_VARS mtime_DIR) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cee2e261..1be94130 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -61,11 +61,11 @@ endif() add_library(mtime::mtime ALIAS mtime) -set(Fortran_MODULE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/mod") +set(Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod) set_target_properties( mtime PROPERTIES Fortran_PREPROCESS ON - Fortran_MODULE_DIRECTORY "${Fortran_MODULE_DIRECTORY}" + Fortran_MODULE_DIRECTORY ${Fortran_MODULE_DIRECTORY} C_STANDARD 99 C_STANDARD_REQUIRED ON PUBLIC_HEADER "${public_headers}" @@ -92,6 +92,6 @@ endif() target_link_libraries(mtime PRIVATE ${MTIME_LIBM}) -install(TARGETS mtime EXPORT "mtime-targets") +install(TARGETS mtime EXPORT mtime-targets) -install(DIRECTORY "${Fortran_MODULE_DIRECTORY}/" TYPE INCLUDE) +install(DIRECTORY ${Fortran_MODULE_DIRECTORY}/ TYPE INCLUDE) -- GitLab