Alter cmake setup to use vcpkg-based vsg, vsgchange. Embed vsgimgui c…

…ode in rdemo.
pelicanmapping · Jun 4, 2024 · 799f240 · 799f240
1 parent b8a5a89
commit 799f240
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -10,14 +10,14 @@ endif()
 # Main PROJECT definition
 project(
     rocky
-    VERSION 0.2.2
+    VERSION 0.3.2
     DESCRIPTION "Rocky by Pelican Mapping"
     HOMEPAGE_URL https://github.com/pelicanmapping/rocky
     LANGUAGES CXX C
 )
 
 # please update this with each ABI change!!
-set(PROJECT_VERSION_ABI 104)
+set(PROJECT_VERSION_ABI 105)
 
 # require C++17
 set(CMAKE_CXX_STANDARD 17)

diff --git a/src/apps/rdemo/CMakeLists.txt b/src/apps/rdemo/CMakeLists.txt
@@ -1,12 +1,12 @@
 set(APP_NAME rdemo)
 
-find_package(vsgImGui)
+find_package(imgui)
 
-if(vsgImGui_FOUND)
+if(imgui_FOUND)
     find_package(glslang CONFIG REQUIRED)
 
-    file(GLOB SOURCES *.cpp)
-    file(GLOB HEADERS *.h)
+    file(GLOB SOURCES *.cpp vsgImGui/*.cpp)
+    file(GLOB HEADERS *.h vsgImGui/*.h)
 
     # enable folders for IDEs
     set_property(GLOBAL PROPERTY USE_FOLDERS ON)
@@ -15,7 +15,7 @@ if(vsgImGui_FOUND)
 
     add_executable(${APP_NAME} ${SOURCES} ${HEADERS})
 
-    target_link_libraries(${APP_NAME} rocky vsgImGui::vsgImGui)
+    target_link_libraries(${APP_NAME} rocky imgui::imgui)
 
     install(TARGETS ${APP_NAME} RUNTIME DESTINATION bin)
 

diff --git a/src/apps/rdemo/helpers.h b/src/apps/rdemo/helpers.h
@@ -5,8 +5,8 @@
  */
 #pragma once
 #include <rocky/vsg/Application.h>
-#include <vsgImGui/RenderImGui.h>
 #include <vsg/commands/Command.h>
+#include "vsgImGui/RenderImGui.h"
 
 // handy nice-looking table with names on the left.
 namespace ImGuiLTable

diff --git a/src/apps/rdemo/rdemo.cpp b/src/apps/rdemo/rdemo.cpp
@@ -23,8 +23,8 @@
 #include <rocky/TMSElevationLayer.h>
 #endif
 
-#include <vsgImGui/RenderImGui.h>
-#include <vsgImGui/SendEventsToImGui.h>
+#include "vsgImGui/RenderImGui.h"
+#include "vsgImGui/SendEventsToImGui.h"
 
 ROCKY_ABOUT(imgui, IMGUI_VERSION)
 

diff --git a/vcpkg/ports/vsg/devendor-glslang.patch → ...ports/_archive/vsg/devendor-glslang.patch b/vcpkg/ports/vsg/devendor-glslang.patch → ...ports/_archive/vsg/devendor-glslang.patch
diff --git a/vcpkg/ports/vsg/portfile.cmake → vcpkg/ports/_archive/vsg/portfile.cmake b/vcpkg/ports/vsg/portfile.cmake → vcpkg/ports/_archive/vsg/portfile.cmake
diff --git a/vcpkg/ports/vsg/vcpkg.json → vcpkg/ports/_archive/vsg/vcpkg.json b/vcpkg/ports/vsg/vcpkg.json → vcpkg/ports/_archive/vsg/vcpkg.json
diff --git a/vcpkg/ports/vsgimgui/portfile.cmake → vcpkg/ports/_archive/vsgimgui/portfile.cmake b/vcpkg/ports/vsgimgui/portfile.cmake → vcpkg/ports/_archive/vsgimgui/portfile.cmake
diff --git a/vcpkg/ports/vsgimgui/vcpkg.json → vcpkg/ports/_archive/vsgimgui/vcpkg.json b/vcpkg/ports/vsgimgui/vcpkg.json → vcpkg/ports/_archive/vsgimgui/vcpkg.json
diff --git a/vcpkg/ports/vsgimgui/vsgImGui.patch → vcpkg/ports/_archive/vsgimgui/vsgImGui.patch b/vcpkg/ports/vsgimgui/vsgImGui.patch → vcpkg/ports/_archive/vsgimgui/vsgImGui.patch
diff --git a/vcpkg/ports/vsgxchange/portfile.cmake → .../ports/_archive/vsgxchange/portfile.cmake b/vcpkg/ports/vsgxchange/portfile.cmake → .../ports/_archive/vsgxchange/portfile.cmake
diff --git a/...g/ports/vsgxchange/require-features.patch → ...archive/vsgxchange/require-features.patch b/...g/ports/vsgxchange/require-features.patch → ...archive/vsgxchange/require-features.patch
diff --git a/vcpkg/ports/vsgxchange/vcpkg.json → vcpkg/ports/_archive/vsgxchange/vcpkg.json b/vcpkg/ports/vsgxchange/vcpkg.json → vcpkg/ports/_archive/vsgxchange/vcpkg.json
diff --git a/vcpkg/ports/vsgxchange/vsgXchange.patch → ...orts/_archive/vsgxchange/vsgXchange.patch b/vcpkg/ports/vsgxchange/vsgXchange.patch → ...orts/_archive/vsgxchange/vsgXchange.patch
diff --git a/vcpkg/vcpkg.json b/vcpkg/vcpkg.json
@@ -13,6 +13,9 @@
           "default-features": false, 
           "features": [ "recommended-features" ] },
         "glm",
+        { "name" : "imgui",
+          "features": [ "vulkan-binding" ] },
+        "imgui",
         "nlohmann-json",
         "openssl",
         "qt5",
@@ -22,7 +25,6 @@
         "vsg",
         { "name" : "vsgxchange",
           "features": [ "assimp", "freetype" ] },
-        "vsgimgui",
         "vsgqt",
         "zlib"
     ]