Bug sqlitebrowser#58: Completed quoting for parameters of some CMake …

…commands A wiki article pointed out that whitespace will only be preserved for parameters in CMake commands if passed strings will be appropriately quoted or escaped. http://cmake.org/Wiki/CMake/Language_Syntax#CMake_splits_arguments_unless_you_use_quotation_marks_or_escapes. Quoting was added so that more places should also handle file names correctly which contain space characters or semicolons eventually. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
jasonbu · Aug 1, 2014 · d3ccdc2 · d3ccdc2
1 parent 8679759
commit d3ccdc2
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 30 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,7 +22,7 @@ if(USE_QT5)
     set(CMAKE_INCLUDE_CURRENT_DIR ON)
 else()
     find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork REQUIRED)
-    include(${QT_USE_FILE})
+    include("${QT_USE_FILE}")
     add_definitions(${QT_DEFINITIONS})
 endif()
 
@@ -99,8 +99,8 @@ set(SQLB_RESOURCES
 
 # Translation files
 set(SQLB_TSS
-	${CMAKE_SOURCE_DIR}/src/translations/sqlb_de.ts
-	${CMAKE_SOURCE_DIR}/src/translations/sqlb_ru.ts
+	"${CMAKE_SOURCE_DIR}/src/translations/sqlb_de.ts"
+	"${CMAKE_SOURCE_DIR}/src/translations/sqlb_ru.ts"
 )
 
 if(USE_QT5)
@@ -109,7 +109,7 @@ if(USE_QT5)
     if(SQLB_TSS)
         # add translations
         foreach(SQLB_TS ${SQLB_TSS})
-            SET_SOURCE_FILES_PROPERTIES(${SQLB_TS} PROPERTIES OUTPUT_LOCATION "${CMAKE_BINARY_DIR}/translations")
+            SET_SOURCE_FILES_PROPERTIES("${SQLB_TS}" PROPERTIES OUTPUT_LOCATION "${CMAKE_BINARY_DIR}/translations")
         endforeach(SQLB_TS ${SQLB_TSS})
         qt5_add_translation(SQLB_QMS ${SQLB_TSS})
     endif(SQLB_TSS)
@@ -120,27 +120,29 @@ else()
     if(SQLB_TSS)
         # add translations
         foreach(SQLB_TS ${SQLB_TSS})
-            SET_SOURCE_FILES_PROPERTIES(${SQLB_TS} PROPERTIES OUTPUT_LOCATION "${CMAKE_BINARY_DIR}/translations")
+            SET_SOURCE_FILES_PROPERTIES("${SQLB_TS}" PROPERTIES OUTPUT_LOCATION "${CMAKE_BINARY_DIR}/translations")
         endforeach(SQLB_TS ${SQLB_TSS})
         QT4_ADD_TRANSLATION(SQLB_QMS ${SQLB_TSS})
     endif(SQLB_TSS)
 endif()
 
+set(gv "${CMAKE_SOURCE_DIR}/src/gen_version.h")
+
 # get git version hash
-if(EXISTS ${CMAKE_SOURCE_DIR}/.git)
-	add_custom_command(OUTPUT ${CMAKE_SOURCE_DIR}/src/gen_version.h
-        COMMAND echo "#ifndef GEN_VERSION_H" > ${CMAKE_SOURCE_DIR}/src/gen_version.h
-        COMMAND echo "#define GEN_VERSION_H" >> ${CMAKE_SOURCE_DIR}/src/gen_version.h
-        COMMAND git log -n1 "--format=#define APP_VERSION \"%h_git\"" >> ${CMAKE_SOURCE_DIR}/src/gen_version.h
-        COMMAND echo "#define MAJOR_VERSION 999" >> ${CMAKE_SOURCE_DIR}/src/gen_version.h
-        COMMAND echo "#define MINOR_VERSION 0" >> ${CMAKE_SOURCE_DIR}/src/gen_version.h
-        COMMAND echo "#define PATCH_VERSION 0" >> ${CMAKE_SOURCE_DIR}/src/gen_version.h
-        COMMAND echo "#endif" >> ${CMAKE_SOURCE_DIR}/src/gen_version.h
+if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
+	add_custom_command(OUTPUT "${gv}"
+        COMMAND echo "#ifndef GEN_VERSION_H" > "${gv}"
+        COMMAND echo "#define GEN_VERSION_H" >> "${gv}"
+        COMMAND git log -n1 "--format=#define APP_VERSION \"%h_git\"" >> "${gv}"
+        COMMAND echo "#define MAJOR_VERSION 999" >> "${gv}"
+        COMMAND echo "#define MINOR_VERSION 0" >> "${gv}"
+        COMMAND echo "#define PATCH_VERSION 0" >> "${gv}"
+        COMMAND echo "#endif" >> "${gv}"
         DEPENDS .git/HEAD
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}"
         VERBATIM)
 else()
-	file(WRITE ${CMAKE_SOURCE_DIR}/src/gen_version.h
+	file(WRITE "${gv}"
 		 "#ifndef GEN_VERSION_H\n"
 		 "#define GEN_VERSION_H\n"
 		 "#define APP_VERSION \"3.0.1\"\n"
@@ -157,14 +159,14 @@ if(WIN32)
 
 	IF( MINGW )
 	# resource compilation for MinGW
-		ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/sqlbicon.o
-			COMMAND windres -I${CMAKE_CURRENT_SOURCE_DIR} -i${CMAKE_CURRENT_SOURCE_DIR}/src/winapp.rc -o ${CMAKE_CURRENT_BINARY_DIR}/sqlbicon.o )
-		set(SQLB_SRC ${SQLB_SRC} ${CMAKE_CURRENT_BINARY_DIR}/sqlbicon.o)
+		ADD_CUSTOM_COMMAND(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/sqlbicon.o"
+			COMMAND windres "-I${CMAKE_CURRENT_SOURCE_DIR}" "-i${CMAKE_CURRENT_SOURCE_DIR}/src/winapp.rc" -o "${CMAKE_CURRENT_BINARY_DIR}/sqlbicon.o" VERBATIM)
+		set(SQLB_SRC ${SQLB_SRC} "${CMAKE_CURRENT_BINARY_DIR}/sqlbicon.o")
 		set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-subsystem,windows")
 		set(WIN32_STATIC_LINK -Wl,-Bstatic -lssl -lcrypto -lws2_32)
 		set(ADDITIONAL_LIBS lcms lzma)
 	ELSE( MINGW )
-		set(SQLB_SRC ${SQLB_SRC} ${CMAKE_CURRENT_SOURCE_DIR}src/winapp.rc)
+		set(SQLB_SRC ${SQLB_SRC} "${CMAKE_CURRENT_SOURCE_DIR}src/winapp.rc")
 	ENDIF( MINGW )
 endif(WIN32)
 
@@ -177,7 +179,7 @@ else(APPLE)
 endif(APPLE)
 
 include_directories(
-		${CMAKE_CURRENT_BINARY_DIR}
+		"${CMAKE_CURRENT_BINARY_DIR}"
 		${ANTLR_DIR}
 		${QHEXEDIT_DIR}
 		${QCUSTOMPLOT_DIR}
@@ -199,9 +201,9 @@ endif()
 add_dependencies(${PROJECT_NAME} antlr qhexedit qcustomplot)
 
 link_directories(
-		${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}
-		${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}
-		${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR})
+		"${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}"
+		"${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}"
+		"${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}")
 
 target_link_libraries(${PROJECT_NAME}
 		antlr

diff --git a/libs/qcustomplot-source/CMakeLists.txt b/libs/qcustomplot-source/CMakeLists.txt
@@ -6,7 +6,7 @@ if(USE_QT5)
     find_package(Qt5Widgets REQUIRED)
 else()
     find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
-    include(${QT_USE_FILE})
+    include("${QT_USE_FILE}")
     add_definitions(${QT_DEFINITIONS})
 endif()
 

diff --git a/libs/qhexedit/CMakeLists.txt b/libs/qhexedit/CMakeLists.txt
@@ -6,7 +6,7 @@ if(USE_QT5)
     find_package(Qt5Widgets REQUIRED)
 else()
     find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
-    include(${QT_USE_FILE})
+    include("${QT_USE_FILE}")
     add_definitions(${QT_DEFINITIONS})
 endif()
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -7,16 +7,16 @@ if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE "Release")
 endif()
 
-set(ANTLR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../libs/antlr-2.7.7)
-add_subdirectory(${ANTLR_DIR} ${CMAKE_CURRENT_BINARY_DIR}/antlr)
+set(ANTLR_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libs/antlr-2.7.7")
+add_subdirectory("${ANTLR_DIR}" "${CMAKE_CURRENT_BINARY_DIR}/antlr")
 
 if(USE_QT5)
     find_package(Qt5Widgets REQUIRED)
     set(CMAKE_AUTOMOC ON)
     set(CMAKE_INCLUDE_CURRENT_DIR ON)
 else()
     find_package(Qt4 COMPONENTS QtCore QtTest QtGui REQUIRED)
-    include(${QT_USE_FILE})
+    include("${QT_USE_FILE}")
     add_definitions(${QT_DEFINITIONS})
 endif()
 
@@ -54,7 +54,7 @@ if(NOT USE_QT5)
     QT4_WRAP_CPP(SQLB_MOC ${SQLB_MOC_HDR})
 endif()
 
-include_directories(${ANTLR_DIR} ../src)
+include_directories("${ANTLR_DIR}" ../src)
 
 add_executable(${PROJECT_NAME} ${SQLB_MOC} ${SQLB_HDR} ${SQLB_SRC})