From 50ffe1b34d08a1a993edcc4311737c50c110da8f Mon Sep 17 00:00:00 2001
From: Glenn <gwaldron@gmail.com>
Date: Sun, 5 May 2024 14:15:00 -0400
Subject: [PATCH 1/2] Update CMakeLists.txt

---
 .../script_engine_duktape/CMakeLists.txt      | 60 +++++--------------
 1 file changed, 15 insertions(+), 45 deletions(-)

diff --git a/src/osgEarthDrivers/script_engine_duktape/CMakeLists.txt b/src/osgEarthDrivers/script_engine_duktape/CMakeLists.txt
index 704d3438a1..7e6fc910a7 100644
--- a/src/osgEarthDrivers/script_engine_duktape/CMakeLists.txt
+++ b/src/osgEarthDrivers/script_engine_duktape/CMakeLists.txt
@@ -1,45 +1,15 @@
-set(WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use external Duktape instead of inlining it")
-
-if(WITH_EXTERNAL_DUKTAPE)
-    find_package(Duktape)
-endif()
-
-if(NOT WITH_EXTERNAL_DUKTAPE OR DUKTAPE_FOUND)
-
-    if(WITH_EXTERNAL_DUKTAPE)
-
-        set(TARGET_H
-            DuktapeEngine
-            JSGeometry )
-
-        set(TARGET_SRC
-            Plugin.cpp
-            DuktapeEngine.cpp )
-    
-        add_osgearth_library_as_plugin(
-            TARGET osgdb_osgearth_scriptengine_javascript
-            HEADERS ${TARGET_H}
-            SOURCES ${TARGET_SRC}
-            INCLUDE_DIRECTORIES ${DUKTAPE_INCLUDE_DIR}
-            LIBRARIES ${DUKTAPE_LIBRARIES} )
-        
-    else()
-        set(TARGET_H
-            DuktapeEngine
-            JSGeometry
-            duktape.h
-            duk_config.h )
-
-        set(TARGET_SRC
-            Plugin.cpp
-            DuktapeEngine.cpp
-            duktape.c )
-    
-        add_osgearth_library_as_plugin(
-            TARGET osgdb_osgearth_scriptengine_javascript
-            HEADERS ${TARGET_H}
-            SOURCES ${TARGET_SRC} )
-
-    endif()
-    
-endif()
+set(TARGET_H
+    DuktapeEngine
+    JSGeometry
+    duktape.h
+    duk_config.h )
+
+set(TARGET_SRC
+    Plugin.cpp
+    DuktapeEngine.cpp
+    duktape.c )
+
+add_osgearth_library_as_plugin(
+    TARGET osgdb_osgearth_scriptengine_javascript
+    HEADERS ${TARGET_H}
+    SOURCES ${TARGET_SRC} )

From b6c2dc83c4683f0777c8608a12f7ba27506dc6cb Mon Sep 17 00:00:00 2001
From: Glenn <gwaldron@gmail.com>
Date: Sun, 5 May 2024 14:17:45 -0400
Subject: [PATCH 2/2] Update CMakeLists.txt

---
 src/osgEarth/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/osgEarth/CMakeLists.txt b/src/osgEarth/CMakeLists.txt
index 8debf69003..819e5ad104 100644
--- a/src/osgEarth/CMakeLists.txt
+++ b/src/osgEarth/CMakeLists.txt
@@ -1009,7 +1009,7 @@ if(Protobuf_FOUND AND Protobuf_PROTOC_EXECUTABLE)
         add_definitions(-DPROTOBUF_USE_DLLS)
     endif()
     #LINK_WITH_VARIABLES(${LIB_NAME} Protobuf_LIBRARIES)
-    target_link_libraries(${LIB_NAME} PRIVATE protobuf::libprotoc protobuf::libprotobuf protobuf::libprotobuf-lite)
+    target_link_libraries(${LIB_NAME} PRIVATE protobuf::libprotobuf)
     message(STATUS "Linking osgEarth with protobuf")
 endif()