Adjustments to the lib directory Cmake files

diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt
index c31b0b0ae31a65de267d37643bf11c5e2bb7ed10..780eb2fc5467df0ea2247fec81c58e53159fa51f 100644 (file)
--- a/src/extension/CMakeLists.txt
+++ b/src/extension/CMakeLists.txt
@@ -28,6 +28,7 @@ ${extension_implementation_SRC}
 ${extension_internal_SRC}
 ${extension_script_SRC}
 )
+
 # Add New folders in src folder here
 SET(extensionfolders
 dxf2svg

diff --git a/src/extension/internal/CMakeLists.txt b/src/extension/internal/CMakeLists.txt
index 7125d2e1c46de555979b9c5d08242d3ac99ee936..ada17b480459121a30b2d3a0d074f4210624d413 100644 (file)
--- a/src/extension/internal/CMakeLists.txt
+++ b/src/extension/internal/CMakeLists.txt
@@ -24,4 +24,17 @@ svg.cpp
 svgz.cpp
 win32.cpp
 wpg-input.cpp
+${extension_internal_bitmap_SRC}
+${extension_internal_pdfinput_SRC}
 )
+
+# Add New folders in src folder here
+SET(extensioninternalfolders
+bitmap
+pdfinput
+)
+\r
+FOREACH(extensionINTdirlist ${extensioninternalfolders})
+ADD_SUBDIRECTORY(${extensionINTdirlist})
+ENDFOREACH(extensionINTdirlist)
+

diff --git a/src/libavoid/CMakeLists.txt b/src/libavoid/CMakeLists.txt
index e2530c183f290b1c06b50625b121fd3af1695749..d2236f61326ea1003c741964baf040a16699d390 100644 (file)
--- a/src/libavoid/CMakeLists.txt
+++ b/src/libavoid/CMakeLists.txt
@@ -27,4 +27,4 @@ vertices.h
 visibility.cpp\r
 visibility.h\r
 )\r
-ADD_LIBRARY(inklibavoid STATIC ${libavoid_SRC})\r
+ADD_LIBRARY(avoid STATIC ${libavoid_SRC})\r

diff --git a/src/libcroco/CMakeLists.txt b/src/libcroco/CMakeLists.txt
index 523855255bb45f6dc6ef2ced5832a42bf4ec4b2b..8d2d54a22f3c2511340fe89eac23f4788dfbb4b5 100644 (file)
--- a/src/libcroco/CMakeLists.txt
+++ b/src/libcroco/CMakeLists.txt
@@ -56,4 +56,4 @@ cr-utils.c
 cr-utils.h\r
 libcroco.h\r
 )\r
-ADD_LIBRARY(inklibcroco STATIC ${libcroco_SRC})
\ No newline at end of file
+ADD_LIBRARY(croco STATIC ${libcroco_SRC})

diff --git a/src/libgdl/CMakeLists.txt b/src/libgdl/CMakeLists.txt
index 7390831699b4888b1c01c62f547992f08a0337b5..a30d0966fe7c0e2ad47f0957365d945233178e46 100644 (file)
--- a/src/libgdl/CMakeLists.txt
+++ b/src/libgdl/CMakeLists.txt
@@ -35,4 +35,4 @@ libgdlmarshal.h
 libgdltypebuiltins.c\r
 libgdltypebuiltins.h\r
 )\r
-ADD_LIBRARY(inklibgdl STATIC ${libgdl_SRC})
\ No newline at end of file
+ADD_LIBRARY(gdl STATIC ${libgdl_SRC})

diff --git a/src/libnr/CMakeLists.txt b/src/libnr/CMakeLists.txt
index 103e5c4ae3a5fc54cb7a4180cd97d2c9cfe34f85..cc2bea1d39e8a7ffe1f4cb9ce9533ea6f757dfb5 100644 (file)
--- a/src/libnr/CMakeLists.txt
+++ b/src/libnr/CMakeLists.txt
@@ -97,4 +97,4 @@ nr-values.cpp
 nr-values.h\r
 testnr.cpp\r
 )\r
-ADD_LIBRARY(inklibnr STATIC ${libnr_SRC})
\ No newline at end of file
+ADD_LIBRARY(nr STATIC ${libnr_SRC})