Skip to content
Snippets Groups Projects
Commit 53f3a946 authored by Sergey Kosukhin's avatar Sergey Kosukhin
Browse files

cmake: drop seemingly redundant quotations

parent 0d4ca0da
No related branches found
No related tags found
1 merge request!50Refactor CMake scripts
...@@ -17,7 +17,7 @@ option(MTIME_ENABLE_FORTRAN_HL "Enable the high-level Fortran interface" ON) ...@@ -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_EXAMPLES "Build examples" ON)
option(MTIME_BUILD_DOCS "Build documentation" OFF) 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 # Set line limit to none for GNU compiler (default is 132) to enable long
# __FILE__ macro: # __FILE__ macro:
...@@ -45,28 +45,26 @@ if(MTIME_BUILD_DOCS) ...@@ -45,28 +45,26 @@ if(MTIME_BUILD_DOCS)
add_subdirectory(doc) add_subdirectory(doc)
endif() 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) include(CMakePackageConfigHelpers)
configure_package_config_file( configure_package_config_file(
"${PROJECT_SOURCE_DIR}/cmake/config.cmake.in" ${PROJECT_SOURCE_DIR}/cmake/config.cmake.in
"${PROJECT_BINARY_DIR}/mtime-config.cmake" ${PROJECT_BINARY_DIR}/mtime-config.cmake
INSTALL_DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake" INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake
NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO
) )
write_basic_package_version_file( write_basic_package_version_file(
"${PROJECT_BINARY_DIR}/mtime-config-version.cmake" ${PROJECT_BINARY_DIR}/mtime-config-version.cmake
VERSION "${mtime_VERSION_MAJOR}.${mtime_VERSION_MINOR}" VERSION ${mtime_VERSION_MAJOR}.${mtime_VERSION_MINOR}
COMPATIBILITY AnyNewerVersion COMPATIBILITY AnyNewerVersion
) )
install( install(EXPORT mtime-targets DESTINATION ${CMAKE_INSTALL_LIBDIR}/mtime/cmake)
EXPORT "mtime-targets" DESTINATION "${CMAKE_INSTALL_LIBDIR}/mtime/cmake"
)
install( install(
FILES "${PROJECT_BINARY_DIR}/mtime-config.cmake" FILES ${PROJECT_BINARY_DIR}/mtime-config.cmake
"${PROJECT_BINARY_DIR}/mtime-config-version.cmake" ${PROJECT_BINARY_DIR}/mtime-config-version.cmake
DESTINATION "${CMAKE_INSTALL_LIBDIR}/mtime/cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/mtime/cmake
) )
...@@ -21,8 +21,8 @@ if(NOT TARGET Check::Interface) ...@@ -21,8 +21,8 @@ if(NOT TARGET Check::Interface)
add_library(Check::Interface UNKNOWN IMPORTED) add_library(Check::Interface UNKNOWN IMPORTED)
set_target_properties( set_target_properties(
Check::Interface Check::Interface
PROPERTIES IMPORTED_LOCATION "${Check_LIBRARY}" PROPERTIES IMPORTED_LOCATION ${Check_LIBRARY}
INTERFACE_INCLUDE_DIRECTORIES "${Check_INCLUDE_DIR}" INTERFACE_INCLUDE_DIRECTORIES ${Check_INCLUDE_DIR}
) )
endif() endif()
endif() endif()
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
function(search_function_library function var_found var_library) function(search_function_library function var_found var_library)
cmake_parse_arguments(PARSE_ARGV 3 ARG "" "" "OPTIONS") cmake_parse_arguments(PARSE_ARGV 3 ARG "" "" "OPTIONS")
if(DEFINED "${var_found}") if(DEFINED ${var_found})
return() return()
endif() endif()
...@@ -33,7 +33,7 @@ function(search_function_library function var_found var_library) ...@@ -33,7 +33,7 @@ function(search_function_library function var_found var_library)
set(CMAKE_REQUIRED_QUIET True) set(CMAKE_REQUIRED_QUIET True)
set(save_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}") set(save_CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES}")
if(DEFINED "${var_library}") if(DEFINED ${var_library})
set(options "${${var_library}}") set(options "${${var_library}}")
else() else()
set(options ";${ARG_OPTIONS}") set(options ";${ARG_OPTIONS}")
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
@PACKAGE_INIT@ @PACKAGE_INIT@
include("${CMAKE_CURRENT_LIST_DIR}/mtime-targets.cmake") include(${CMAKE_CURRENT_LIST_DIR}/mtime-targets.cmake)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(mtime REQUIRED_VARS mtime_DIR) find_package_handle_standard_args(mtime REQUIRED_VARS mtime_DIR)
...@@ -61,11 +61,11 @@ endif() ...@@ -61,11 +61,11 @@ endif()
add_library(mtime::mtime ALIAS mtime) 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( set_target_properties(
mtime mtime
PROPERTIES Fortran_PREPROCESS ON PROPERTIES Fortran_PREPROCESS ON
Fortran_MODULE_DIRECTORY "${Fortran_MODULE_DIRECTORY}" Fortran_MODULE_DIRECTORY ${Fortran_MODULE_DIRECTORY}
C_STANDARD 99 C_STANDARD 99
C_STANDARD_REQUIRED ON C_STANDARD_REQUIRED ON
PUBLIC_HEADER "${public_headers}" PUBLIC_HEADER "${public_headers}"
...@@ -92,6 +92,6 @@ endif() ...@@ -92,6 +92,6 @@ endif()
target_link_libraries(mtime PRIVATE ${MTIME_LIBM}) 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)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment