From d864f1276a9589667bd9f9ff3f290be202a93b5f Mon Sep 17 00:00:00 2001 From: talksik Date: Fri, 4 Aug 2023 14:32:42 -0700 Subject: [PATCH] small mods, but trying to make lsp work properly --- .../index/main.cpp.49FBEF79F06E80B4.idx | Bin 0 -> 996 bytes .gitignore | 1 + CMakeLists.txt | 6 +++- build.sh | 26 ++++++++++++++++++ compile_commands.json | 17 ++++++++++++ src/CMakeLists.txt | 2 +- 6 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 .cache/clangd/index/main.cpp.49FBEF79F06E80B4.idx create mode 100644 .gitignore create mode 100755 build.sh create mode 100644 compile_commands.json diff --git a/.cache/clangd/index/main.cpp.49FBEF79F06E80B4.idx b/.cache/clangd/index/main.cpp.49FBEF79F06E80B4.idx new file mode 100644 index 0000000000000000000000000000000000000000..dfcbe24bf16deb640ac485cd0114707cf4e91e63 GIT binary patch literal 996 zcmWIYbaT7I%)sEB;#rZKT9U}Zz`!5`#Kk2=nL8O77&ZX~D&|ZLzMXg5famIe7NhBl zP9JWt$>|f9=$^gPd!oDZ#E9t|bR>7B+`jLhc}Z1rTNxWm*L3HuMST*_dy1cC^!I%a zd$?z=k3{^H*=q6k#m}z#Q?g|m|I?d0w9RgR{X2d0;&owHs{+^Ti`}W$({8lCA^-Hz zO*iHoP_?-!r^s=)@|D9fwFOGfdoPr(PZamm{@@p9AuZUPdyzqMqT&azD(y_zn_yn9$%k2ZwY^2$^)m#A5x-@T~_*k znf;CA_8$HfEu1RnrRwcWL(5*|mI&=sGT*;1blF-FsXvnoIMV!WzZ{BYZk{kVZ}&@9xFy%Z!iJ1{7P)^jZF9SDEaCS~K6*Vo{p2Z|bI8D6eyP8O$nN z|KafLeN#Uho%(-dsYl*ji62InIKIfXy}wqfY$T+AY~ku7CU1{Faha5Cb!$?V;h)Mw z_MHFN-hE)La#Wjq_<%wcyS32-j)R}PN`A~NS#(iyzN*l_W9idum;GRG2o!Fz>g+$f zz|-#kyhB@33TjqfR#>oa#n*Ibc*buKgw_lv0xH30M9vG7y=QX!_XiPoG!=TB) zpux<-%mF5VG7wOdnpRu@jOmWOavBr9ZQx<#(clo}P=-m*IL>X9w&J=FP?(j4RRCt% z$%G%v9Bu~bf>aA|h`@xu)@9yaF1=Zgkp*l>-(735OX0eGGxlyeQCh8G0u_d-o;3TU zuTy=9Gnye6uD6y?XF21GW=QeA8`rXL=A;8vbMbQt!wgY9&#Ae#MmQg+npKb$?vh;h zLp*s)l*@p^>{9FsFx8h_^#1(%wW}Iv2s;bABup6QP&5Zt)PAWs;^ejoO&F$&kqad# zKZtJ-IuO`(2IL)X4t|)b&y%nHJatC(GnyeqsX2+DKrSvyE(V1*v&OVY&A?e(BC03c~W-JQ9Lp PqP%=U0wSvX;*81w*Cu-L literal 0 HcmV?d00001 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..567609b --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 07c7f0d..331babb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,11 @@ cmake_minimum_required(VERSION 2.8) # 3rd party tools -find_package(Qt5 COMPONENTS Widgets Qml Quick REQUIRED) +find_package(Qt5 COMPONENTS + Widgets + Qml + Quick + REQUIRED) # Directory with the source code add_subdirectory(src) diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..769f406 --- /dev/null +++ b/build.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +echo "Building project | making build folder, and going into it..." +rm -rf build && +mkdir build && +cd build && + +echo "Running cmake with build type Debug." +cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_PREFIX_PATH=$HOME/Qt/5.15.14/gcc_64/ -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug .. && + +echo "=====================" +echo "Running make..." +echo "=====================" + +make && + +echo "=====================" +echo "copy compile-commands.json to root folder..." +echo "=====================" +cd .. && +cp build/compile_commands.json . && + +echo "=====================" +echo "running app" +echo "=====================" +./build/src/MinimalQml diff --git a/compile_commands.json b/compile_commands.json new file mode 100644 index 0000000..b010c30 --- /dev/null +++ b/compile_commands.json @@ -0,0 +1,17 @@ +[ +{ + "directory": "/home/talksik/code/MinimalQml/build/src", + "command": "/usr/bin/c++ -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_QMLMODELS_LIB -DQT_QML_LIB -DQT_QUICK_LIB -DQT_WIDGETS_LIB -I/home/talksik/code/MinimalQml/build/src/MinimalQml_autogen/include -isystem /home/talksik/Qt/5.15.14/gcc_64/include -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtWidgets -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtGui -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtCore -isystem /home/talksik/Qt/5.15.14/gcc_64/./mkspecs/linux-g++ -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQml -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtNetwork -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQuick -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQmlModels -Wall -Werror -std=c++11 -fstrict-aliasing -pedantic-errors -pedantic -Wno-deprecated-declarations -Wno-unused-variable -g -fPIC -o CMakeFiles/MinimalQml.dir/MinimalQml_autogen/mocs_compilation.cpp.o -c /home/talksik/code/MinimalQml/build/src/MinimalQml_autogen/mocs_compilation.cpp", + "file": "/home/talksik/code/MinimalQml/build/src/MinimalQml_autogen/mocs_compilation.cpp" +}, +{ + "directory": "/home/talksik/code/MinimalQml/build/src", + "command": "/usr/bin/c++ -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_QMLMODELS_LIB -DQT_QML_LIB -DQT_QUICK_LIB -DQT_WIDGETS_LIB -I/home/talksik/code/MinimalQml/build/src/MinimalQml_autogen/include -isystem /home/talksik/Qt/5.15.14/gcc_64/include -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtWidgets -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtGui -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtCore -isystem /home/talksik/Qt/5.15.14/gcc_64/./mkspecs/linux-g++ -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQml -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtNetwork -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQuick -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQmlModels -Wall -Werror -std=c++11 -fstrict-aliasing -pedantic-errors -pedantic -Wno-deprecated-declarations -Wno-unused-variable -g -fPIC -o CMakeFiles/MinimalQml.dir/main.cpp.o -c /home/talksik/code/MinimalQml/src/main.cpp", + "file": "/home/talksik/code/MinimalQml/src/main.cpp" +}, +{ + "directory": "/home/talksik/code/MinimalQml/build/src", + "command": "/usr/bin/c++ -DQT_CORE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_QMLMODELS_LIB -DQT_QML_LIB -DQT_QUICK_LIB -DQT_WIDGETS_LIB -I/home/talksik/code/MinimalQml/build/src/MinimalQml_autogen/include -isystem /home/talksik/Qt/5.15.14/gcc_64/include -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtWidgets -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtGui -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtCore -isystem /home/talksik/Qt/5.15.14/gcc_64/./mkspecs/linux-g++ -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQml -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtNetwork -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQuick -isystem /home/talksik/Qt/5.15.14/gcc_64/include/QtQmlModels -Wall -Werror -std=c++11 -fstrict-aliasing -pedantic-errors -pedantic -Wno-deprecated-declarations -Wno-unused-variable -g -fPIC -o CMakeFiles/MinimalQml.dir/qrc_qml.cpp.o -c /home/talksik/code/MinimalQml/build/src/qrc_qml.cpp", + "file": "/home/talksik/code/MinimalQml/build/src/qrc_qml.cpp" +} +] \ No newline at end of file diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ce66845..f72de1f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,5 +33,5 @@ target_link_libraries(${PROJECT} Qt5::Widgets Qt5::Qml Qt5::Quick - ) +)