Cmake by ASchuberth · Pull Request #9 · ASchuberth/Cadera

This repository was archived by the owner on Jan 22, 2026. It is now read-only.

CMakeLists.txt

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,55 +1,69 @@
  
    cmake_minimum_required(VERSION 3.0.0)

    cmake_minimum_required(VERSION 3.13)

    set(CMAKE_TOOLCHAIN_FILE "C:\\vcpkg\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake" )

    project(Cadera VERSION 0.0.1)

    project(Cadera VERSION 0.1.0)

    include(CTest)

    enable_testing()

    #=========================================

    # Targets

    #=========================================

    add_executable(CaderaApp    src/Cadera.cpp

                                src/Selection.cpp

                                src/Callbacks.cpp

                                src/Model.cpp    

                                src/Main.cpp

    )

    add_subdirectory(src/render)

    add_subdirectory(src/sketch)

    add_subdirectory(src/ux)

    add_executable(Cadera   src/Cadera.cpp

                            src/CADRender.cpp  

                            src/TextRender.cpp  

                            src/RenderUtil.cpp  

                            src/Selection.cpp

                            src/Camera.cpp   

                            src/Callbacks.cpp

                            src/gui.cpp

                            src/Sketch.cpp

                            src/Sketcher.cpp

                            src/SketchSolver.cpp

                            src/Point.cpp

                            src/Model.cpp

                            src/Feature.cpp

                            src/Relation.cpp

                            src/grid.cpp      

                            src/Main.cpp

    set_target_properties(CaderaApp PROPERTIES

        OUTPUT_NAME CaderaApp

        EXPORT_NAME CaderaApp

    )

    add_executable(tester test/tester.cpp)

    add_test(tester tester)

    target_compile_definitions(CaderaApp PUBLIC)

    target_precompile_headers(Cadera PRIVATE include/pch.hpp)

    target_include_directories(Cadera PRIVATE include/)

    #=========================================

    # Precompiled Headers / Include Directories

    #=========================================

    target_precompile_headers(CaderaApp PRIVATE src/pch.hpp)

    target_include_directories(CaderaApp PRIVATE src/)

    #=========================================

    # Libraries

    #=========================================

    find_package(Vulkan REQUIRED)

    target_link_libraries(Cadera PRIVATE Vulkan::Vulkan)

    target_link_libraries(CaderaApp PRIVATE Vulkan::Vulkan)

    find_package(glfw3 CONFIG REQUIRED)

    target_link_libraries(Cadera PRIVATE glfw)

    target_link_libraries(CaderaApp PRIVATE glfw)

    find_package(Stb REQUIRED)

    target_include_directories(Cadera PRIVATE ${Stb_INCLUDE_DIR})

    target_include_directories(CaderaApp PRIVATE ${Stb_INCLUDE_DIR})

    find_package(Microsoft.GSL CONFIG REQUIRED)

    target_link_libraries(Cadera PRIVATE Microsoft.GSL::GSL)

    target_link_libraries(CaderaApp PRIVATE Microsoft.GSL::GSL)

    find_package(imgui CONFIG REQUIRED)

    target_link_libraries(Cadera PRIVATE imgui::imgui)

    target_link_libraries(CaderaApp PRIVATE imgui::imgui)

    #=========================================

    # Testing

    #=========================================

    include_directories(test)

    #=========================================

    # Packaging

    #=========================================

    set(CPACK_PROJECT_NAME ${PROJECT_NAME})

    set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})

    include(CPack)

include/Canvas.hpp

This file was deleted.

include/Cadera.hpp → src/Cadera.hpp

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     #pragma once
-    #include "gui.hpp"
+    #include "ux/gui.hpp"
@@ Expand Down @@

src/Canvas.cpp

This file was deleted.

src/Main.cpp

-Original file line number
+Diff line change
@@ -1,7 +1,7 @@
     #include "pch.hpp"
     #include "Cadera.hpp"
     #include <gsl/gsl>
-    #include <CADRender.hpp>
     VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
@@ Expand Down @@

include/Model.hpp → src/Model.hpp

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     #pragma once
-    #include "TextRender.hpp"
-    #include "grid.hpp"
+    #include "render/TextRender.hpp"
+    #include "render/grid.hpp"
     namespace CADERA_APP_NAMESPACE {
@@ Expand Down @@

include/Selection.hpp → src/Selection.hpp

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     #pragma once
-    #include "Sketch.hpp"
+    #include "sketch/SketchSolver.hpp"
     namespace CADERA_APP_NAMESPACE {
@@ Expand Down @@

0 include/callbacks.hpp → src/callbacks.hpp

File renamed without changes.

0 include/pch.hpp → src/pch.hpp

File renamed without changes.

0 src/CADRender.cpp → src/render/CADRender.cpp

File renamed without changes.

include/CADRender.hpp → src/render/CADRender.hpp

Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,7 +2,7 @@

		#include "callbacks.hpp"
		#include "Camera.hpp"
		#include "SketchSolver.hpp"




Expand Down

src/render/CMakeLists.txt

-Original file line number
+Diff line change
@@ -0,0 +1,11 @@
+    cmake_minimum_required(VERSION 3.13)
+    target_sources(CaderaApp PRIVATE ${CMAKE_CURRENT_LIST_DIR}/CADRender.cpp
+                                     ${CMAKE_CURRENT_LIST_DIR}/Camera.cpp
+                                     ${CMAKE_CURRENT_LIST_DIR}/RenderUtil.cpp
+                                     ${CMAKE_CURRENT_LIST_DIR}/TextRender.cpp
+                                     ${CMAKE_CURRENT_LIST_DIR}/Grid.cpp
+                                     )

0 src/Camera.cpp → src/render/Camera.cpp

File renamed without changes.

0 include/Camera.hpp → src/render/Camera.hpp

File renamed without changes.

0 src/RenderUtil.cpp → src/render/RenderUtil.cpp

File renamed without changes.

0 include/RenderUtil.hpp → src/render/RenderUtil.hpp

File renamed without changes.

0 src/TextRender.cpp → src/render/TextRender.cpp

File renamed without changes.

0 include/TextRender.hpp → src/render/TextRender.hpp

File renamed without changes.

0 src/grid.cpp → src/render/grid.cpp

File renamed without changes.

include/grid.hpp → src/render/grid.hpp

-Original file line number
+Diff line change
@@ -1,5 +1,5 @@
     #pragma once
-    #include "RenderUtil.hpp"
+    #include "render/RenderUtil.hpp"
     namespace CADERA_APP_NAMESPACE {
@@ Expand Down @@

src/sketch/CMakeLists.txt

-Original file line number
+Diff line change
@@ -0,0 +1,12 @@
+    cmake_minimum_required(VERSION 3.13)
+    target_sources(CaderaApp PRIVATE ${CMAKE_CURRENT_LIST_DIR}/Relation.cpp
+                                     ${CMAKE_CURRENT_LIST_DIR}/Feature.cpp
+                                     ${CMAKE_CURRENT_LIST_DIR}/Sketch.cpp
+                                     ${CMAKE_CURRENT_LIST_DIR}/Sketcher.cpp
+                                     ${CMAKE_CURRENT_LIST_DIR}/SketchSolver.cpp
+                                     ${CMAKE_CURRENT_LIST_DIR}/Point.cpp
+                                     )

0 src/Feature.cpp → src/sketch/Feature.cpp

File renamed without changes.

0 include/Feature.hpp → src/sketch/Feature.hpp

File renamed without changes.

0 src/Point.cpp → src/sketch/Point.cpp

File renamed without changes.

0 include/Point.hpp → src/sketch/Point.hpp

File renamed without changes.

0 src/Relation.cpp → src/sketch/Relation.cpp

File renamed without changes.

0 include/Relation.hpp → src/sketch/Relation.hpp

File renamed without changes.

0 src/Sketch.cpp → src/sketch/Sketch.cpp

File renamed without changes.

0 include/Sketch.hpp → src/sketch/Sketch.hpp

File renamed without changes.

0 src/SketchSolver.cpp → src/sketch/SketchSolver.cpp

File renamed without changes.

0 include/SketchSolver.hpp → src/sketch/SketchSolver.hpp

File renamed without changes.

0 src/Sketcher.cpp → src/sketch/Sketcher.cpp

File renamed without changes.

0 include/Sketcher.hpp → src/sketch/Sketcher.hpp

File renamed without changes.

src/sketch/pch.hpp

-Original file line number
+Diff line change
@@ -0,0 +1,9 @@
+    #include <cassert>
+    #include <iostream>
+    #include <map>
+    #include <vector>
+    #include <bitset>
+    #include <list>
+    #include <set>
+    #include <fstream>
+    #include <chrono>

src/ux/CMakeLists.txt

-Original file line number
+Diff line change
@@ -0,0 +1,6 @@
+    cmake_minimum_required(VERSION 3.13)
+    target_sources(CaderaApp PRIVATE ${CMAKE_CURRENT_LIST_DIR}/gui.cpp
+                                     )

src/gui.cpp → src/ux/gui.cpp

-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    #include "pch.hpp"
+    #include "../pch.hpp"
     #include "gui.hpp"
     namespace CADERA_APP_NAMESPACE {
@@ Expand Down @@

include/gui.hpp → src/ux/gui.hpp

-Original file line number
+Diff line change
@@ -1,6 +1,6 @@
     #pragma once
-    #include "CADRender.hpp"
+    #include "../render/CADRender.hpp"
     namespace CADERA_APP_NAMESPACE {
     namespace gui {
@@ Expand Down @@

test/CMakeLists.txt

-Original file line number
+Diff line change
@@ -0,0 +1,6 @@
+    cmake_minimum_required(VERSION 3.13)
+    add_executable(tester test/tester.cpp)
+    add_test(tester tester)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cmake #9

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!