simplifying further
This commit is contained in:
Binary file not shown.
Binary file not shown.
+35
-3
@@ -1,13 +1,45 @@
|
|||||||
cmake_minimum_required(VERSION 2.8)
|
cmake_minimum_required(VERSION 2.8)
|
||||||
|
|
||||||
|
set(PROJECT_NAME "MinimalQml")
|
||||||
|
project(${PROJECT_NAME} LANGUAGES CXX)
|
||||||
|
|
||||||
|
set(CMAKE_CXX_STANDARD 11)
|
||||||
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
|
|
||||||
# 3rd party tools
|
# 3rd party tools
|
||||||
find_package(Qt5 COMPONENTS
|
find_package(Qt5 COMPONENTS
|
||||||
Widgets
|
Widgets
|
||||||
Qml
|
Qml
|
||||||
Quick
|
Quick
|
||||||
REQUIRED)
|
REQUIRED
|
||||||
|
)
|
||||||
|
|
||||||
# Directory with the source code
|
# not sure if needed
|
||||||
add_subdirectory(src)
|
include_directories(${Qt5Widgets_INCLUDE_DIRS} ${QtQml_INCLUDE_DIRS})
|
||||||
|
add_definitions(${Qt5Widgets_DEFINITIONS} ${QtQml_DEFINITIONS} ${${Qt5Quick_DEFINITIONS}})
|
||||||
|
|
||||||
|
set(CMAKE_AUTOMOC ON)
|
||||||
|
set(CMAKE_AUTORCC ON)
|
||||||
|
set(CMAKE_AUTOUIC ON)
|
||||||
|
|
||||||
|
# get all files together
|
||||||
|
if(NOT DEFINED HEADERS)
|
||||||
|
file(GLOB HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/src/*.h)
|
||||||
|
endif()
|
||||||
|
if(NOT DEFINED SOURCES)
|
||||||
|
file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
|
||||||
|
endif()
|
||||||
|
# print out the files
|
||||||
|
message(STATUS "HEADERS: ${HEADERS}")
|
||||||
|
message(STATUS "SOURCES: ${SOURCES}")
|
||||||
|
source_group("Header Files" FILES ${HEADERS})
|
||||||
|
source_group("Source Files" FILES ${SOURCES})
|
||||||
|
|
||||||
|
add_executable(${PROJECT_NAME} ${HEADERS} ${SOURCES} ${QT_RESOURCES})
|
||||||
|
|
||||||
|
target_link_libraries(${PROJECT_NAME}
|
||||||
|
Qt5::Widgets
|
||||||
|
Qt5::Qml
|
||||||
|
Qt5::Quick
|
||||||
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,9 @@ mkdir build &&
|
|||||||
cd build &&
|
cd build &&
|
||||||
|
|
||||||
echo "Running cmake with build type Debug."
|
echo "Running cmake with build type Debug."
|
||||||
cmake -DCMAKE_CXX_COMPILER=/usr/bin/g++ -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DCMAKE_PREFIX_PATH=$HOME/Qt/5.15.14/gcc_64/ -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug .. &&
|
cmake -DCMAKE_PREFIX_PATH=$HOME/Qt/5.15.14/gcc_64/ \
|
||||||
|
-G "Unix Makefiles" \
|
||||||
|
-DCMAKE_BUILD_TYPE=Debug .. &&
|
||||||
|
|
||||||
echo "====================="
|
echo "====================="
|
||||||
echo "Running make..."
|
echo "Running make..."
|
||||||
@@ -23,4 +25,4 @@ cp build/compile_commands.json . &&
|
|||||||
echo "====================="
|
echo "====================="
|
||||||
echo "running app"
|
echo "running app"
|
||||||
echo "====================="
|
echo "====================="
|
||||||
./build/src/MinimalQml
|
./build/MinimalQml
|
||||||
|
|||||||
+5
-10
@@ -1,17 +1,12 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"directory": "/home/talksik/code/MinimalQml/build/src",
|
"directory": "/home/talksik/code/MinimalQml/build",
|
||||||
"command": "/usr/bin/g++ -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",
|
"command": "/usr/bin/g++ -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/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 -g -fPIC -std=gnu++11 -o CMakeFiles/MinimalQml.dir/MinimalQml_autogen/mocs_compilation.cpp.o -c /home/talksik/code/MinimalQml/build/MinimalQml_autogen/mocs_compilation.cpp",
|
||||||
"file": "/home/talksik/code/MinimalQml/build/src/MinimalQml_autogen/mocs_compilation.cpp"
|
"file": "/home/talksik/code/MinimalQml/build/MinimalQml_autogen/mocs_compilation.cpp"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"directory": "/home/talksik/code/MinimalQml/build/src",
|
"directory": "/home/talksik/code/MinimalQml/build",
|
||||||
"command": "/usr/bin/g++ -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",
|
"command": "/usr/bin/g++ -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/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 -g -fPIC -std=gnu++11 -o CMakeFiles/MinimalQml.dir/src/main.cpp.o -c /home/talksik/code/MinimalQml/src/main.cpp",
|
||||||
"file": "/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/g++ -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"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
include_directories(${Qt5Widgets_INCLUDE_DIRS} ${QtQml_INCLUDE_DIRS})
|
|
||||||
add_definitions(${Qt5Widgets_DEFINITIONS} ${QtQml_DEFINITIONS} ${${Qt5Quick_DEFINITIONS}})
|
|
||||||
|
|
||||||
qt5_add_resources(QT_RESOURCES qml.qrc)
|
|
||||||
|
|
||||||
|
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
|
|
||||||
set(CMAKE_AUTOMOC ON)
|
|
||||||
set(CMAKE_AUTORCC ON)
|
|
||||||
set(CMAKE_AUTOUIC ON)
|
|
||||||
|
|
||||||
|
|
||||||
set(PROJECT "MinimalQml")
|
|
||||||
|
|
||||||
project(${PROJECT})
|
|
||||||
|
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -std=c++11 -fstrict-aliasing -pedantic-errors -pedantic -Wno-deprecated-declarations -Wno-unused-variable")
|
|
||||||
|
|
||||||
if(NOT DEFINED HEADERS)
|
|
||||||
file(GLOB HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(NOT DEFINED SOURCES)
|
|
||||||
file(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
source_group("Header Files" FILES ${HEADERS})
|
|
||||||
source_group("Source Files" FILES ${SOURCES})
|
|
||||||
|
|
||||||
add_executable(${PROJECT} ${HEADERS} ${SOURCES} ${QT_RESOURCES})
|
|
||||||
|
|
||||||
target_link_libraries(${PROJECT}
|
|
||||||
Qt5::Widgets
|
|
||||||
Qt5::Qml
|
|
||||||
Qt5::Quick
|
|
||||||
)
|
|
||||||
|
|
||||||
+1
-1
@@ -6,7 +6,7 @@ int main(int argc, char** argv)
|
|||||||
QApplication app(argc, argv);
|
QApplication app(argc, argv);
|
||||||
|
|
||||||
QQmlApplicationEngine engine;
|
QQmlApplicationEngine engine;
|
||||||
engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
|
engine.load(QUrl(QStringLiteral("./src/main.qml")));
|
||||||
|
|
||||||
return app.exec();
|
return app.exec();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
<RCC>
|
|
||||||
<qresource prefix="/">
|
|
||||||
<file>main.qml</file>
|
|
||||||
</qresource>
|
|
||||||
</RCC>
|
|
||||||
Reference in New Issue
Block a user