core: add quotes around paths in CMake files (closes #29)

weechat · May 13, 2023 · 6415c09 · 6415c09
1 parent adbfd27
commit 6415c09
Show file tree

Hide file tree

Showing 42 changed files with 624 additions and 623 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -25,7 +25,7 @@ project(weechat C)
 
 # CMake options
 set(CMAKE_VERBOSE_MAKEFILE OFF)
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
 set(CMAKE_SKIP_RPATH ON)
 
 # compiler options
@@ -38,16 +38,16 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU")
 endif()
 
 # version
-execute_process(COMMAND ${CMAKE_SOURCE_DIR}/version.sh devel-major OUTPUT_VARIABLE VERSION_MAJOR)
-execute_process(COMMAND ${CMAKE_SOURCE_DIR}/version.sh devel-minor OUTPUT_VARIABLE VERSION_MINOR)
-execute_process(COMMAND ${CMAKE_SOURCE_DIR}/version.sh devel-patch OUTPUT_VARIABLE VERSION_PATCH)
+execute_process(COMMAND "${CMAKE_SOURCE_DIR}/version.sh" devel-major OUTPUT_VARIABLE VERSION_MAJOR)
+execute_process(COMMAND "${CMAKE_SOURCE_DIR}/version.sh" devel-minor OUTPUT_VARIABLE VERSION_MINOR)
+execute_process(COMMAND "${CMAKE_SOURCE_DIR}/version.sh" devel-patch OUTPUT_VARIABLE VERSION_PATCH)
 string(REGEX REPLACE "\n" "" VERSION_MAJOR "${VERSION_MAJOR}")
 string(REGEX REPLACE "\n" "" VERSION_MINOR "${VERSION_MINOR}")
 string(REGEX REPLACE "\n" "" VERSION_PATCH "${VERSION_PATCH}")
 if(VERSION_PATCH STREQUAL "")
-  set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR})
+  set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}")
 else()
-  set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
+  set(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 endif()
 
 # license
@@ -66,33 +66,33 @@ set(PKG_STRING "${PROJECT_NAME} ${VERSION}")
 string(REPLACE "\";\"" "\ " PKG_STRING ${PKG_STRING})
 
 if(NOT DEFINED LIBDIR)
-  set(LIBDIR ${CMAKE_INSTALL_PREFIX}/lib)
+  set(LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
 endif()
 
 if(NOT DEFINED WEECHAT_LIBDIR)
-  set(WEECHAT_LIBDIR ${LIBDIR}/${PROJECT_NAME})
+  set(WEECHAT_LIBDIR "${LIBDIR}/${PROJECT_NAME}")
 endif()
 
 if(NOT DEFINED DATAROOTDIR)
-  set(DATAROOTDIR ${CMAKE_INSTALL_PREFIX}/share)
+  set(DATAROOTDIR "${CMAKE_INSTALL_PREFIX}/share")
 endif()
 
 if(NOT DEFINED WEECHAT_SHAREDIR)
-  set(WEECHAT_SHAREDIR ${DATAROOTDIR}/weechat)
+  set(WEECHAT_SHAREDIR "${DATAROOTDIR}/weechat")
 endif()
 
 if(NOT DEFINED MANDIR)
-  set(MANDIR ${DATAROOTDIR}/man)
+  set(MANDIR "${DATAROOTDIR}/man")
 endif()
 
 if(NOT DEFINED LOCALEDIR)
-  set(LOCALEDIR ${DATAROOTDIR}/locale)
+  set(LOCALEDIR "${DATAROOTDIR}/locale")
 endif()
 
 if(DEFINED INCLUDEDIR)
-  set(INCLUDEDIR ${INCLUDEDIR}/${PROJECT_NAME})
+  set(INCLUDEDIR "${INCLUDEDIR}/${PROJECT_NAME}")
 else()
-  set(INCLUDEDIR ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME})
+  set(INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME}")
 endif()
 
 option(ENABLE_NCURSES        "Compile the Ncurses interface"            ON)
@@ -297,7 +297,7 @@ add_custom_target(uninstall
 
 add_custom_target(dist
   "${CMAKE_CURRENT_SOURCE_DIR}/tools/makedist.sh" "${VERSION}" "HEAD" "${CMAKE_CURRENT_BINARY_DIR}"
-  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 
 # pkgconfig file
@@ -306,23 +306,23 @@ set(prefix "${CMAKE_INSTALL_PREFIX}")
 set(exec_prefix "\${prefix}")
 string(REPLACE "${CMAKE_INSTALL_PREFIX}" "\${prefix}" libdir "${LIBDIR}")
 set(includedir "\${prefix}/include")
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc @ONLY)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.pc DESTINATION ${LIBDIR}/pkgconfig)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/weechat.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/weechat.pc" @ONLY)
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/weechat.pc" DESTINATION "${LIBDIR}/pkgconfig")
 
 # cygport file (used to build Cygwin packages)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/weechat.cygport.in ${CMAKE_CURRENT_BINARY_DIR}/weechat-${VERSION}-1.cygport @ONLY)
+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/weechat.cygport.in" "${CMAKE_CURRENT_BINARY_DIR}/weechat-${VERSION}-1.cygport" @ONLY)
 
 # install some files (only on Cygwin)
 if(CYGWIN)
   install(FILES
-    ${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/Contributing.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/README.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/ReleaseNotes.adoc
-    DESTINATION ${DATAROOTDIR}/doc/${PROJECT_NAME}
+    "${CMAKE_CURRENT_SOURCE_DIR}/AUTHORS.adoc"
+    "${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog.adoc"
+    "${CMAKE_CURRENT_SOURCE_DIR}/Contributing.adoc"
+    "${CMAKE_CURRENT_SOURCE_DIR}/README.adoc"
+    "${CMAKE_CURRENT_SOURCE_DIR}/ReleaseNotes.adoc"
+    DESTINATION "${DATAROOTDIR}/doc/${PROJECT_NAME}"
   )
 endif()
 
 # desktop file
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/weechat.desktop DESTINATION ${DATAROOTDIR}/applications)
+install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/weechat.desktop" DESTINATION "${DATAROOTDIR}/applications")
diff --git a/ChangeLog.adoc b/ChangeLog.adoc
@@ -88,6 +88,7 @@ Build::
   * core: remove build of .bz2 and .zst files in `make dist`
   * core: remove obsolete cpack config
   * core: add "stable-number" and "devel-number" in script version.sh
+  * core: add quotes around paths in CMake files (issue #29)
   * doc: convert docgen.py to C, remove autogen files from repository, add parameter `--doc-gen` to `weechat-headless` binary, add CMake option `ENABLE_DOC_INCOMPLETE`
 
 [[v3.8]]

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -47,41 +47,41 @@ if(ENABLE_MAN OR ENABLE_DOC)
 
     # ChangeLog
     add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ChangeLog-links.adoc
-      COMMAND sed ARGS ${SED_LINKS_ARGS} ${CMAKE_CURRENT_SOURCE_DIR}/../ChangeLog.adoc > ${CMAKE_CURRENT_BINARY_DIR}/ChangeLog-links.adoc
+      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ChangeLog-links.adoc"
+      COMMAND sed ARGS ${SED_LINKS_ARGS} "${CMAKE_CURRENT_SOURCE_DIR}/../ChangeLog.adoc" > "${CMAKE_CURRENT_BINARY_DIR}/ChangeLog-links.adoc"
       DEPENDS
-      ${CMAKE_CURRENT_SOURCE_DIR}/../ChangeLog.adoc
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+      "${CMAKE_CURRENT_SOURCE_DIR}/../ChangeLog.adoc"
+      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
     )
     add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ChangeLog.html
-      COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -a docinfodir="${CMAKE_CURRENT_SOURCE_DIR}" -o ChangeLog.html ${CMAKE_CURRENT_BINARY_DIR}/ChangeLog-links.adoc
+      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ChangeLog.html"
+      COMMAND "${ASCIIDOCTOR_EXECUTABLE}" ARGS ${ASCIIDOCTOR_ARGS} -a docinfodir="${CMAKE_CURRENT_SOURCE_DIR}" -o ChangeLog.html "${CMAKE_CURRENT_BINARY_DIR}/ChangeLog-links.adoc"
       DEPENDS
-      ${CMAKE_CURRENT_SOURCE_DIR}/docinfo.html
-      ${CMAKE_CURRENT_BINARY_DIR}/ChangeLog-links.adoc
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+      "${CMAKE_CURRENT_SOURCE_DIR}/docinfo.html"
+      "${CMAKE_CURRENT_BINARY_DIR}/ChangeLog-links.adoc"
+      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
       COMMENT "Building ChangeLog.html"
     )
-    add_custom_target(changelog DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ChangeLog.html)
+    add_custom_target(changelog DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/ChangeLog.html")
 
     # Release notes
     add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes-links.adoc
-      COMMAND sed ARGS ${SED_LINKS_ARGS} ${CMAKE_CURRENT_SOURCE_DIR}/../ReleaseNotes.adoc > ${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes-links.adoc
+      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes-links.adoc"
+      COMMAND sed ARGS ${SED_LINKS_ARGS} "${CMAKE_CURRENT_SOURCE_DIR}/../ReleaseNotes.adoc" > "${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes-links.adoc"
       DEPENDS
-      ${CMAKE_CURRENT_SOURCE_DIR}/../ReleaseNotes.adoc
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+      "${CMAKE_CURRENT_SOURCE_DIR}/../ReleaseNotes.adoc"
+      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
     )
     add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes.html
-      COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -a docinfodir="${CMAKE_CURRENT_SOURCE_DIR}" -o ReleaseNotes.html ${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes-links.adoc
+      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes.html"
+      COMMAND "${ASCIIDOCTOR_EXECUTABLE}" ARGS ${ASCIIDOCTOR_ARGS} -a docinfodir="${CMAKE_CURRENT_SOURCE_DIR}" -o ReleaseNotes.html "${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes-links.adoc"
       DEPENDS
-      ${CMAKE_CURRENT_SOURCE_DIR}/docinfo.html
-      ${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes-links.adoc
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+      "${CMAKE_CURRENT_SOURCE_DIR}/docinfo.html"
+      "${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes-links.adoc"
+      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
       COMMENT "Building ReleaseNotes.html"
     )
-    add_custom_target(rn DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes.html)
+    add_custom_target(rn DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/ReleaseNotes.html")
 
     if(ENABLE_DOC)
       set(AUTOGEN_FILES "")

diff --git a/doc/cs/CMakeLists.txt b/doc/cs/CMakeLists.txt
@@ -20,48 +20,48 @@
 if(ENABLE_MAN)
   # man page: weechat
   add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat.1
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.adoc
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/weechat.1"
+    COMMAND "${ASCIIDOCTOR_EXECUTABLE}" ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat.1 "${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.adoc"
     DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.cs.adoc
-    ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.cs.adoc
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    "${CMAKE_CURRENT_SOURCE_DIR}/weechat.1.cs.adoc"
+    "${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.cs.adoc"
+    "${CMAKE_CURRENT_SOURCE_DIR}/includes/man.cs.adoc"
+    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
     COMMENT "Building weechat.1 (cs)"
   )
-  add_custom_target(doc-man-weechat-cs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat.1)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat.1 DESTINATION ${MANDIR}/cs/man1)
+  add_custom_target(doc-man-weechat-cs ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/weechat.1")
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/weechat.1" DESTINATION "${MANDIR}/cs/man1")
 
   if(ENABLE_HEADLESS)
     # man page: weechat-headless
     add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1
-      COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.cs.adoc
+      OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1"
+      COMMAND "${ASCIIDOCTOR_EXECUTABLE}" ARGS ${ASCIIDOCTOR_ARGS} -b manpage -o weechat-headless.1 "${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.cs.adoc"
       DEPENDS
-      ${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.cs.adoc
-      ${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.cs.adoc
-      ${CMAKE_CURRENT_SOURCE_DIR}/includes/man.cs.adoc
-      WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+      "${CMAKE_CURRENT_SOURCE_DIR}/weechat-headless.1.cs.adoc"
+      "${CMAKE_CURRENT_SOURCE_DIR}/includes/cmdline_options.cs.adoc"
+      "${CMAKE_CURRENT_SOURCE_DIR}/includes/man.cs.adoc"
+      WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
       COMMENT "Building weechat-headless.1 (cs)"
     )
-    add_custom_target(doc-man-weechat-headless-cs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1)
-    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1 DESTINATION ${MANDIR}/cs/man1)
+    add_custom_target(doc-man-weechat-headless-cs ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1")
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/weechat-headless.1" DESTINATION "${MANDIR}/cs/man1")
   endif()
 endif()
 
 if(ENABLE_DOC)
 
   # quickstart
   add_custom_command(
-    OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.cs.html
-    COMMAND ${ASCIIDOCTOR_EXECUTABLE} ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.cs.html ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.cs.adoc
+    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.cs.html"
+    COMMAND "${ASCIIDOCTOR_EXECUTABLE}" ARGS ${ASCIIDOCTOR_ARGS} -o weechat_quickstart.cs.html "${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.cs.adoc"
     DEPENDS
-    ${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html
-    ${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.cs.adoc
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+    "${CMAKE_CURRENT_SOURCE_DIR}/../docinfo.html"
+    "${CMAKE_CURRENT_SOURCE_DIR}/weechat_quickstart.cs.adoc"
+    WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
     COMMENT "Building weechat_quickstart.cs.html"
   )
-  add_custom_target(doc-quickstart-cs ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.cs.html)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.cs.html DESTINATION ${DATAROOTDIR}/doc/${PROJECT_NAME})
+  add_custom_target(doc-quickstart-cs ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.cs.html")
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/weechat_quickstart.cs.html" DESTINATION "${DATAROOTDIR}/doc/${PROJECT_NAME}")
 
 endif()