corinthia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j...@apache.org
Subject incubator-corinthia git commit: Core working with new CMakeList.txt DocFormats/core is now converted, and runs. DocFormats contains 2 header files (DFCommon.h and DFTypes.h) they have been moved down to core/headers for now. Once the conversion is done,
Date Tue, 23 Dec 2014 15:56:21 GMT
Repository: incubator-corinthia
Updated Branches:
  refs/heads/master 797dc5189 -> 9037c1f3d


Core working with new CMakeList.txt
DocFormats/core is now converted, and runs.
DocFormats contains 2 header files (DFCommon.h and DFTypes.h) they
have been moved down to core/headers for now.
Once the conversion is done, we need to cleanup the include relations.


Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/9037c1f3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/9037c1f3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/9037c1f3

Branch: refs/heads/master
Commit: 9037c1f3d241f99d6e7a14c27cccd96c9b03f8ac
Parents: 797dc51
Author: jani <jani@apache.org>
Authored: Tue Dec 23 16:54:02 2014 +0100
Committer: jani <jani@apache.org>
Committed: Tue Dec 23 16:54:02 2014 +0100

----------------------------------------------------------------------
 DocFormats/CMakeLists.txt                |   6 +-
 DocFormats/DFCommon.h                    |  31 -------
 DocFormats/DFTypes.h                     |  35 --------
 DocFormats/api/CMakeLists.txt            |   2 +-
 DocFormats/core/CMakeLists.txt           | 117 ++++++++++++++++++++------
 DocFormats/core/headers/DFCommon.h       |  31 +++++++
 DocFormats/core/headers/DFCore.h         |  19 +++++
 DocFormats/core/headers/DFTypes.h        |  35 ++++++++
 DocFormats/core/tests/names/NamesTests.c |  27 ++++++
 DocFormats/filters/latex/CMakeLists.txt  |   2 +-
 DocFormats/filters/odf/CMakeLists.txt    |   2 +-
 DocFormats/filters/ooxml/CMakeLists.txt  |   2 +-
 DocFormats/platform/CMakeLists.txt       |  15 ++--
 DocFormats/unittest/CMakeLists.txt       |   2 +-
 consumers/dftest/src/CMakeLists.txt      |   2 +-
 consumers/dfutil/src/CMakeLists.txt      |   2 +-
 16 files changed, 222 insertions(+), 108 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9037c1f3/DocFormats/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/CMakeLists.txt b/DocFormats/CMakeLists.txt
index c561c40..685be81 100644
--- a/DocFormats/CMakeLists.txt
+++ b/DocFormats/CMakeLists.txt
@@ -18,6 +18,7 @@ include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(SYSTEM ./api/headers)
 include_directories(.)
 include_directories(./platform/headers)
+include_directories(./core/headers)
 include_directories(./core/src/common)
 include_directories(./core/src/css)
 include_directories(./core/src/html)
@@ -30,11 +31,9 @@ include_directories(./filters/ooxml/src/common)
 include_directories(./filters/ooxml/src/word)
 include_directories(./filters/ooxml/src/word/formatting)
 include_directories(./filters/ooxml/src/word/lenses)
-include_directories(./unittest)
+include_directories(../unittest)
 
 set(GroupRoot
-    DFCommon.h
-    DFTypes.h
     DocFormats.c
     $<TARGET_OBJECTS:api>
     $<TARGET_OBJECTS:core>
@@ -43,6 +42,7 @@ set(GroupRoot
     $<TARGET_OBJECTS:latex>
     $<TARGET_OBJECTS:odf>
     $<TARGET_OBJECTS:platform>
+    $<TARGET_OBJECTS:core>
 )
 
 add_library(DocFormats

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9037c1f3/DocFormats/DFCommon.h
----------------------------------------------------------------------
diff --git a/DocFormats/DFCommon.h b/DocFormats/DFCommon.h
deleted file mode 100644
index d6cdbd7..0000000
--- a/DocFormats/DFCommon.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef DocFormats_DFCommon_h
-#define DocFormats_DFCommon_h
-
-#include "DFTypes.h"
-
-#ifdef WIN32
-#define snprintf _snprintf
-#define strcasecmp _stricmp
-#define bzero(mem,size) memset(mem,0,size)
-#else // not WIN32
-#endif
-
-#ifndef S_ISDIR
-#define S_ISDIR(m)      (((m) & S_IFMT) == S_IFDIR)     /* directory */
-#endif
-
-#endif

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9037c1f3/DocFormats/DFTypes.h
----------------------------------------------------------------------
diff --git a/DocFormats/DFTypes.h b/DocFormats/DFTypes.h
deleted file mode 100644
index d8fe590..0000000
--- a/DocFormats/DFTypes.h
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2012-2014 UX Productivity Pty Ltd
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-#ifndef DocFormats_DFTypes_h
-#define DocFormats_DFTypes_h
-
-#ifdef _MSC_VER
-#define ATTRIBUTE_ALIGNED(n) __declspec(align(8))
-#define ATTRIBUTE_FORMAT(archetype,index,first)
-#else
-#define ATTRIBUTE_ALIGNED(n) __attribute__((aligned (n)))
-#define ATTRIBUTE_FORMAT(archetype,index,first) __attribute__((format(archetype,index,first)))
-#endif
-
-#ifdef WIN32
-#define _CRT_SECURE_NO_WARNINGS
-#endif
-
-#include <sys/types.h>
-#include <stdint.h>
-#include <stdarg.h>
-#include <stddef.h>
-
-#endif

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9037c1f3/DocFormats/api/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/api/CMakeLists.txt b/DocFormats/api/CMakeLists.txt
index 970a678..0e3382c 100644
--- a/DocFormats/api/CMakeLists.txt
+++ b/DocFormats/api/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(../../DocFormats/3rdparty/external/minizip)
 
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(SYSTEM ../api/headers)
-include_directories(..)
+include_directories(../core/headers)
 include_directories(../platform/headers)
 include_directories(../core/src/common)
 include_directories(../core/src/css)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9037c1f3/DocFormats/core/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/core/CMakeLists.txt b/DocFormats/core/CMakeLists.txt
index 55b8fe8..225c7b9 100644
--- a/DocFormats/core/CMakeLists.txt
+++ b/DocFormats/core/CMakeLists.txt
@@ -1,19 +1,25 @@
-include_directories(/usr/include/libxml2)
-include_directories(../../DocFormats/platform/3rdparty/w3c-tidy-html5/include)
-include_directories(../../DocFormats/platform/3rdparty//w3c-tidy-html5/src)
-include_directories(../../DocFormats/platform/3rdparty/minizip)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 
-include_directories(SYSTEM ${INCLUDE_DIRS})
-include_directories(SYSTEM ../api/headers)
-include_directories(..)
-include_directories(../platform/headers)
-include_directories(src/common)
-include_directories(src/css)
-include_directories(src/html)
-include_directories(src/lib)
-include_directories(src/names)
-include_directories(src/xml)
-include_directories(../unittest)
+
+###
+## group common objects incl test
+###
+set(GroupHeaders
+    headers/DFCore.h
+    headers/DFCommon.h
+    headers/DFTypes.h)
 
 set(GroupSrcCommon
     src/common/DFBDT.c
@@ -26,6 +32,11 @@ set(GroupTestsCommon
     tests/common/BDTTests.c
     tests/common/BDTTests.h)
 
+
+
+###
+## group CSS objects incl test
+###
 set(GroupSrcCSS
     src/css/CSS.c
     src/css/CSS.h
@@ -47,6 +58,11 @@ set(GroupSrcCSS
 set(GroupTestsCSS
     tests/css/CSSTests.c)
 
+
+
+###
+## group HTML objects incl test
+###
 set(GroupSrcHTML
     src/html/DFHTDocument.c
     src/html/DFHTDocument.h
@@ -66,6 +82,11 @@ set(GroupTestsHTML
     tests/html/HTMLPlain.h
     tests/html/HTMLTests.c)
 
+
+
+###
+## group LIB objects incl test
+###
 set(GroupSrcLib
     src/lib/DFAllocator.c
     src/lib/DFAllocator.h
@@ -93,12 +114,25 @@ set(GroupSrcLib
 set(GroupTestsLib
     tests/lib/LibTests.c)
 
+
+
+###
+## group NAMES objects incl test
+###
 set(GroupSrcNames
     src/names/DFXMLNames.c
     src/names/DFXMLNames.h
     src/names/DFXMLNamespaces.c
     src/names/DFXMLNamespaces.h)
 
+set(GroupTestsNames
+    tests/names/NamesTests.c)
+
+
+
+###
+## group XML objects incl test
+###
 set(GroupSrcXML
     src/xml/DFChanges.c
     src/xml/DFChanges.h
@@ -114,7 +148,35 @@ set(GroupSrcXML
 set(GroupTestsXML
     tests/xml/XMLTests.c)
 
+
+
+###
+# Common include for all core files
+###
+include_directories()
+include_directories(/usr/include/libxml2)
+include_directories(../../DocFormats/platform/3rdparty/w3c-tidy-html5/include)
+include_directories(../../DocFormats/platform/3rdparty//w3c-tidy-html5/src)
+include_directories(../../DocFormats/platform/3rdparty/minizip)
+include_directories(SYSTEM ${INCLUDE_DIRS})
+include_directories(SYSTEM ../api/headers)
+include_directories(../platform/headers)
+include_directories(src/common)
+include_directories(src/css)
+include_directories(src/html)
+include_directories(src/lib)
+include_directories(src/names)
+include_directories(src/xml)
+include_directories(../unittest)
+include_directories(headers)
+
+
+
+###
+# Prebuild library (needed to use different compile options)
+###
 add_library(core OBJECT
+    ${GroupHeaders}
     ${GroupSrcCommon}
     ${GroupSrcCSS}
     ${GroupSrcHTML}
@@ -125,17 +187,20 @@ add_library(core OBJECT
     ${GroupTestsCSS}
     ${GroupTestsHTML}
     ${GroupTestsLib}
+    ${GroupTestsNames}
     ${GroupTestsXML})
 
-source_group(src\\common FILES ${GroupSrcCommon})
-source_group(src\\css FILES ${GroupSrcCSS})
-source_group(src\\html FILES ${GroupSrcHTML})
-source_group(src\\lib FILES ${GroupSrcLib})
-source_group(src\\names FILES ${GroupSrcNames})
-source_group(src\\xml FILES ${GroupSrcXML})
-
+source_group(headers       FILES ${GroupHeaders})
+source_group(src\\common   FILES ${GroupSrcCommon})
+source_group(src\\css      FILES ${GroupSrcCSS})
+source_group(src\\html     FILES ${GroupSrcHTML})
+source_group(src\\lib      FILES ${GroupSrcLib})
+source_group(src\\names    FILES ${GroupSrcNames})
+source_group(src\\xml      FILES ${GroupSrcXML})
 source_group(tests\\common FILES ${GroupTestsCommon})
-source_group(tests\\css FILES ${GroupTestsCSS})
-source_group(tests\\html FILES ${GroupTestsHTML})
-source_group(tests\\lib FILES ${GroupTestsLib})
-source_group(tests\\xml FILES ${GroupTestsXML})
+source_group(tests\\css    FILES ${GroupTestsCSS})
+source_group(tests\\html   FILES ${GroupTestsHTML})
+source_group(tests\\lib    FILES ${GroupTestsLib})
+source_group(tests\\names  FILES ${GroupTestsNames})
+source_group(tests\\xml    FILES ${GroupTestsXML})
+set_property(TARGET core PROPERTY FOLDER DocFormats)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9037c1f3/DocFormats/core/headers/DFCommon.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/headers/DFCommon.h b/DocFormats/core/headers/DFCommon.h
new file mode 100644
index 0000000..d6cdbd7
--- /dev/null
+++ b/DocFormats/core/headers/DFCommon.h
@@ -0,0 +1,31 @@
+// Copyright 2012-2014 UX Productivity Pty Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef DocFormats_DFCommon_h
+#define DocFormats_DFCommon_h
+
+#include "DFTypes.h"
+
+#ifdef WIN32
+#define snprintf _snprintf
+#define strcasecmp _stricmp
+#define bzero(mem,size) memset(mem,0,size)
+#else // not WIN32
+#endif
+
+#ifndef S_ISDIR
+#define S_ISDIR(m)      (((m) & S_IFMT) == S_IFDIR)     /* directory */
+#endif
+
+#endif

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9037c1f3/DocFormats/core/headers/DFCore.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/headers/DFCore.h b/DocFormats/core/headers/DFCore.h
new file mode 100644
index 0000000..3505038
--- /dev/null
+++ b/DocFormats/core/headers/DFCore.h
@@ -0,0 +1,19 @@
+// Copyright 2012-2014 UX Productivity Pty Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef DocFormats_DFCore_h
+#define DocFormats_DFCore_h
+
+
+#endif

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9037c1f3/DocFormats/core/headers/DFTypes.h
----------------------------------------------------------------------
diff --git a/DocFormats/core/headers/DFTypes.h b/DocFormats/core/headers/DFTypes.h
new file mode 100644
index 0000000..d8fe590
--- /dev/null
+++ b/DocFormats/core/headers/DFTypes.h
@@ -0,0 +1,35 @@
+// Copyright 2012-2014 UX Productivity Pty Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef DocFormats_DFTypes_h
+#define DocFormats_DFTypes_h
+
+#ifdef _MSC_VER
+#define ATTRIBUTE_ALIGNED(n) __declspec(align(8))
+#define ATTRIBUTE_FORMAT(archetype,index,first)
+#else
+#define ATTRIBUTE_ALIGNED(n) __attribute__((aligned (n)))
+#define ATTRIBUTE_FORMAT(archetype,index,first) __attribute__((format(archetype,index,first)))
+#endif
+
+#ifdef WIN32
+#define _CRT_SECURE_NO_WARNINGS
+#endif
+
+#include <sys/types.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <stddef.h>
+
+#endif

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9037c1f3/DocFormats/core/tests/names/NamesTests.c
----------------------------------------------------------------------
diff --git a/DocFormats/core/tests/names/NamesTests.c b/DocFormats/core/tests/names/NamesTests.c
new file mode 100644
index 0000000..cbf3bc7
--- /dev/null
+++ b/DocFormats/core/tests/names/NamesTests.c
@@ -0,0 +1,27 @@
+// Copyright 2012-2014 UX Productivity Pty Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "DFUnitTest.h"
+#include <stddef.h>
+
+static void test_sample(void)
+{
+}
+
+TestGroup LibTests = {
+    "core.lib", {
+        { "sample", PlainTest, test_sample },
+        { NULL, PlainTest, NULL }
+    }
+};

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9037c1f3/DocFormats/filters/latex/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/filters/latex/CMakeLists.txt b/DocFormats/filters/latex/CMakeLists.txt
index 77f305f..bdd38e3 100644
--- a/DocFormats/filters/latex/CMakeLists.txt
+++ b/DocFormats/filters/latex/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(../../DocFormats/3rdparty/external/minizip)
 
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(SYSTEM ../../api/headers)
-include_directories(../..)
+include_directories(../../core/headers)
 include_directories(../../platform/headers)
 include_directories(../../core/src/common)
 include_directories(../../core/src/css)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9037c1f3/DocFormats/filters/odf/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/filters/odf/CMakeLists.txt b/DocFormats/filters/odf/CMakeLists.txt
index 411d713..e306102 100644
--- a/DocFormats/filters/odf/CMakeLists.txt
+++ b/DocFormats/filters/odf/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(../../DocFormats/3rdparty/external/minizip)
 
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(SYSTEM ../../api/headers)
-include_directories(../..)
+include_directories(../../core/headers)
 include_directories(../../platform/headers)
 include_directories(../../core/src/common)
 include_directories(../../core/src/css)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9037c1f3/DocFormats/filters/ooxml/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/filters/ooxml/CMakeLists.txt b/DocFormats/filters/ooxml/CMakeLists.txt
index a5a1fc5..2a27027 100644
--- a/DocFormats/filters/ooxml/CMakeLists.txt
+++ b/DocFormats/filters/ooxml/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(../../DocFormats/3rdparty/external/minizip)
 
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(SYSTEM ../../api/headers)
-include_directories(../..)
+include_directories(../../core/headers)
 include_directories(../../platform/headers)
 include_directories(../../core/src/common)
 include_directories(../../core/src/css)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9037c1f3/DocFormats/platform/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/platform/CMakeLists.txt b/DocFormats/platform/CMakeLists.txt
index ce07c33..dcf9471 100644
--- a/DocFormats/platform/CMakeLists.txt
+++ b/DocFormats/platform/CMakeLists.txt
@@ -116,19 +116,22 @@ include_directories(3rdparty/w3c-tidy-html5/src)
 include_directories(../../external/include)
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(headers)
-#include_directories(../unittest)
+include_directories(../unittest)
 
 
 
+###
+# Prebuild library (needed to use different compile options)
+###
 add_library(platform OBJECT
     ${GroupMinizip}
 	${GroupHtml5}
     ${GroupHeaders}
     ${GroupSrc}
     ${GroupTests})
-source_group(headers FILES ${GroupHeaders})
-source_group(src FILES ${GroupSrc})
-source_group(tests FILES ${GroupTests})
-source_group("src\\minizip" FILES ${GroupMinizip})
-source_group("src\\w3c-tidy-html5" FILES ${GroupHtml5})
+source_group(headers             FILES ${GroupHeaders})
+source_group(src                 FILES ${GroupSrc})
+source_group(tests               FILES ${GroupTests})
+source_group(src\\minizip        FILES ${GroupMinizip})
+source_group(src\\w3c-tidy-html5 FILES ${GroupHtml5})
 set_property(TARGET platform PROPERTY FOLDER DocFormats)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9037c1f3/DocFormats/unittest/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/DocFormats/unittest/CMakeLists.txt b/DocFormats/unittest/CMakeLists.txt
index 62d3aec..f788970 100644
--- a/DocFormats/unittest/CMakeLists.txt
+++ b/DocFormats/unittest/CMakeLists.txt
@@ -5,7 +5,7 @@ include_directories(../../DocFormats/3rdparty/external/minizip)
 
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(SYSTEM ../api/headers)
-include_directories(..)
+include_directories(../core/headers)
 include_directories(../platform/headers)
 include_directories(../core/src/common)
 include_directories(../core/src/css)

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9037c1f3/consumers/dftest/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/consumers/dftest/src/CMakeLists.txt b/consumers/dftest/src/CMakeLists.txt
index ea6d1e0..aad2d2e 100644
--- a/consumers/dftest/src/CMakeLists.txt
+++ b/consumers/dftest/src/CMakeLists.txt
@@ -6,7 +6,7 @@ set(SOURCES
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(.)
 include_directories(SYSTEM ../../../DocFormats/api/headers)
-include_directories(../../../DocFormats)
+include_directories(../../../DocFormats/core/headers)
 include_directories(../../../DocFormats/core/src/lib)
 include_directories(../../../DocFormats/unittest)
 link_directories(${LIB_DIRS})

http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/9037c1f3/consumers/dfutil/src/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/consumers/dfutil/src/CMakeLists.txt b/consumers/dfutil/src/CMakeLists.txt
index 2107b92..4b916dc 100644
--- a/consumers/dfutil/src/CMakeLists.txt
+++ b/consumers/dfutil/src/CMakeLists.txt
@@ -11,7 +11,7 @@ set(SOURCES
 include_directories(SYSTEM ${INCLUDE_DIRS})
 include_directories(SYSTEM ../../../DocFormats/api/headers)
 include_directories(.)
-include_directories(../../../DocFormats)
+include_directories(../../../DocFormats/core/headers)
 include_directories(../../../DocFormats/unittest)
 include_directories(../../../DocFormats/platform/headers)
 include_directories(../../../DocFormats/core/src/common)


Mime
View raw message