search

fhackenberger / ktikz

KtikZ provides a nice user interface for making pictures using TikZ.
Other
350 stars 34 forks source link

Fix quotes escaping for CMake build #11

Closed zeule closed 7 years ago

zeule commented 7 years ago

Some time ago (maybe after a cmake update) KTikZ stopped to build with cmake on my system because cmake generetes the following invocation of GCC:

 /usr/bin/c++   -DAPPNAME=\"ktikz\" -DAPPVERSION=\"0.11\" -DKDE4_CMAKE_TOPLEVEL_DIR_LENGTH=26 -DKDE_DEPRECATED_WARNINGS -DKTIKZ_KPART -DKTIKZ_TEMPLATE_EDITOR_DEFAULT=\"kwrite\" -DKTIKZ_TIKZ_DOCUMENTATION_DEFAULT=\"/usr/share/doc/texmf/pgf/pgfmanual.pdf.gz\" -DKTIKZ_TRANSLATIONS_INSTALL_DIR="\\\"/usr/share/apps/ktikz/locale\\\"" -DKTIKZ_USE_KDE -DMAKE_KTIKZPART_LIB -DORGNAME=\"Florian_Hackenberger\" -DQT_CORE_LIB -DQT_DBUS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_NO_CAST_TO_ASCII -DQT_NO_STL -DQT_SVG_LIB -DQT_XML_LIB -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_REENTRANT -D_XOPEN_SOURCE=500 -Ipart -I../part -I../part/../common -I/usr/include/KDE -I/usr/include/qt4/QtXmlPatterns -isystem /usr/include/qt4/QtXml -I/usr/include/qt4/QtWebKit -I/usr/include/qt4/QtUiTools -I/usr/include/qt4/QtTest -isystem /usr/include/qt4/QtSvg -I/usr/include/qt4/QtSql -I/usr/include/qt4/QtScriptTools -I/usr/include/qt4/QtScript -I/usr/include/qt4/QtOpenGL -isystem /usr/include/qt4/QtNetwork -I/usr/include/qt4/QtMultimedia -I/usr/include/qt4/QtDesigner -I/usr/include/qt4/QtDeclarative -isystem /usr/include/qt4/QtDBus -I/usr/include/qt4/Qt3Support -isystem /usr/include/qt4/QtGui -isystem /usr/include/qt4/QtCore -I/usr/include/qt4/Qt -isystem /usr/share/qt4/mkspecs/default -isystem /usr/include/qt4 -I/usr/include/poppler/qt4 -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common -Woverloaded-virtual -fno-threadsafe-statics -fvisibility=hidden -fvisibility-inlines-hidden -g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline -fPIC   -D_GNU_SOURCE -D_LARGEFILE64_SOURCE -MD -MT part/CMakeFiles/ktikzpart.dir/part.cpp.o -MF part/CMakeFiles/ktikzpart.dir/part.cpp.o.d -o part/CMakeFiles/ktikzpart.dir/part.cpp.o -c /home/eugene/develop/alien/ktikz/part/part.cpp

Notice the incorrect definition:

-DKTIKZ_TRANSLATIONS_INSTALL_DIR="\\\"/usr/share/apps/ktikz/locale\\\""

This PR replaces escaping with a simper variant which works find for me (cmake 3.7.2).

fhackenberger commented 7 years ago

Thanks for your contribution

zeule commented 7 years ago

thanks.