Fix compilation when path includes spaces

stlink-org · Feb 21, 2017 · 2370f28 · 2370f28
1 parent fc4fd76
commit 2370f28
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/doc/compiling.md b/doc/compiling.md
@@ -2,7 +2,7 @@
 
 ## Build from sources
 
-* CMake (minimal v2.8.7)
+* CMake (minimal v3.0)
 * C compiler (gcc, clang, mingw)
 * Libusb 1.0 (minimal v1.0.9)
 * (optional) pandoc for generating manpages from markdown
@@ -123,7 +123,7 @@ $ cmake -DSTLINK_UDEV_RULES_DIR="/usr/lib/udev/rules.d" \
 ### Prequistes
 
 * 7Zip
-* CMake 2.8 or higher
+* CMake 3.0 or higher
 * MinGW64 GCC toolchain (5.3.0)
 
 ### Installation

diff --git a/src/tools/gui/CMakeLists.txt b/src/tools/gui/CMakeLists.txt
@@ -9,13 +9,13 @@ include_directories(SYSTEM ${gtk_INCLUDE_DIRS})
 
 add_executable(stlink-gui-local ${GUI_SOURCES})
 set_target_properties(stlink-gui-local PROPERTIES
-                      COMPILE_FLAGS -DSTLINK_UI_DIR=\\"${CMAKE_CURRENT_SOURCE_DIR}/gui\\")
+                      COMPILE_DEFINITIONS STLINK_UI_DIR="${CMAKE_CURRENT_SOURCE_DIR}/gui")
 target_link_libraries(stlink-gui-local ${STLINK_LIB_STATIC} ${gtk_LDFLAGS})
 
 
 add_executable(stlink-gui ${GUI_SOURCES})
 set_target_properties(stlink-gui PROPERTIES
-                      COMPILE_FLAGS -DSTLINK_UI_DIR=\\"${CMAKE_INSTALL_PREFIX}/${INSTALLED_UI_DIR}\\")
+                      COMPILE_DEFINITIONS STLINK_UI_DIR="${CMAKE_INSTALL_PREFIX}/${INSTALLED_UI_DIR}")
 target_link_libraries(stlink-gui ${STLINK_LIB_STATIC} ${gtk_LDFLAGS})
 
 install(TARGETS stlink-gui