From 48216f8833c6dd5d86cf56ba24d94e82cdf9d632 Mon Sep 17 00:00:00 2001 From: verbalshadow Date: Sun, 30 Mar 2008 18:24:50 +0000 Subject: [PATCH] Adjustments to the lib directory Cmake files --- src/extension/CMakeLists.txt | 1 + src/extension/internal/CMakeLists.txt | 13 +++++++++++++ src/libavoid/CMakeLists.txt | 2 +- src/libcroco/CMakeLists.txt | 2 +- src/libgdl/CMakeLists.txt | 2 +- src/libnr/CMakeLists.txt | 2 +- 6 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt index c31b0b0ae..780eb2fc5 100644 --- 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 7125d2e1c..ada17b480 100644 --- 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 +) + +FOREACH(extensionINTdirlist ${extensioninternalfolders}) +ADD_SUBDIRECTORY(${extensionINTdirlist}) +ENDFOREACH(extensionINTdirlist) + diff --git a/src/libavoid/CMakeLists.txt b/src/libavoid/CMakeLists.txt index e2530c183..d2236f613 100644 --- a/src/libavoid/CMakeLists.txt +++ b/src/libavoid/CMakeLists.txt @@ -27,4 +27,4 @@ vertices.h visibility.cpp visibility.h ) -ADD_LIBRARY(inklibavoid STATIC ${libavoid_SRC}) +ADD_LIBRARY(avoid STATIC ${libavoid_SRC}) diff --git a/src/libcroco/CMakeLists.txt b/src/libcroco/CMakeLists.txt index 523855255..8d2d54a22 100644 --- a/src/libcroco/CMakeLists.txt +++ b/src/libcroco/CMakeLists.txt @@ -56,4 +56,4 @@ cr-utils.c cr-utils.h libcroco.h ) -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 739083169..a30d0966f 100644 --- a/src/libgdl/CMakeLists.txt +++ b/src/libgdl/CMakeLists.txt @@ -35,4 +35,4 @@ libgdlmarshal.h libgdltypebuiltins.c libgdltypebuiltins.h ) -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 103e5c4ae..cc2bea1d3 100644 --- a/src/libnr/CMakeLists.txt +++ b/src/libnr/CMakeLists.txt @@ -97,4 +97,4 @@ nr-values.cpp nr-values.h testnr.cpp ) -ADD_LIBRARY(inklibnr STATIC ${libnr_SRC}) \ No newline at end of file +ADD_LIBRARY(nr STATIC ${libnr_SRC}) -- 2.30.2