Per thirdparty library CMakeLists.xt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 93da12ff76651f2d5b57b10ef034559aae8302c1..9d55619b6f834512e33be53c19b373e6e2d5dc32 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -96,54 +96,26 @@ include_directories (${CMAKE_CURRENT_SOURCE_DIR})
 # Bundled dependencies
 
 # Use bundled ZLIB if system one can't be found
-if (ZLIB_FOUND)
-    include_directories (${ZLIB_INCLUDE_DIRS})
-    link_libraries (${ZLIB_LIBRARIES})
-else (ZLIB_FOUND)
-    add_library (zlib STATIC
-        zlib/adler32.c
-        zlib/compress.c
-        zlib/crc32.c
-        zlib/gzio.c
-        zlib/uncompr.c
-        zlib/deflate.c
-        zlib/trees.c
-        zlib/zutil.c
-        zlib/inflate.c
-        zlib/infback.c
-        zlib/inftrees.c
-        zlib/inffast.c
-    )
-    include_directories (zlib)
-    link_libraries (zlib)
-endif (ZLIB_FOUND)
+if (NOT ZLIB_FOUND)
+    set (ZLIB_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/zlib)
+    set (ZLIB_LIBRARIES zlib)
+    add_subdirectory (zlib EXCLUDE_FROM_ALL)
+endif (NOT ZLIB_FOUND)
+
+include_directories (${ZLIB_INCLUDE_DIRS})
+link_libraries (${ZLIB_LIBRARIES})
 
 # Use bundled LIBPNG if system one can't be found
 if (PNG_FOUND)
-    include_directories (${PNG_INCLUDE_DIR})
-    add_definitions (${PNG_DEFINITIONS})
-    link_libraries (${PNG_LIBRARIES})
 else (PNG_FOUND)
-    add_library (png STATIC
-        libpng/png.c
-        libpng/pngerror.c
-        libpng/pngget.c
-        libpng/pngmem.c
-        libpng/pngpread.c
-        libpng/pngread.c
-        libpng/pngrio.c
-        libpng/pngrtran.c
-        libpng/pngrutil.c
-        libpng/pngset.c
-        libpng/pngtrans.c
-        libpng/pngwio.c
-        libpng/pngwrite.c
-        libpng/pngwtran.c
-        libpng/pngwutil.c
-    )
-    include_directories (libpng)
-    link_libraries (png)
+    set (PNG_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/libpng)
+    set (PNG_DEFINITIONS "")
+    set (PNG_LIBRARIES png)
+    add_subdirectory (libpng EXCLUDE_FROM_ALL)
 endif (PNG_FOUND)
+include_directories (${PNG_INCLUDE_DIR})
+add_definitions (${PNG_DEFINITIONS})
+link_libraries (${PNG_LIBRARIES})
 
 
 ##############################################################################

diff --git a/libpng/CMakeLists.txt b/libpng/CMakeLists.txt
new file mode 100644 (file)
index 0000000..2ce40e1
--- /dev/null
+++ b/libpng/CMakeLists.txt
@@ -0,0 +1,23 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+if (NOT WIN32)
+    add_definitions (-fPIC)
+endif (NOT WIN32)
+
+add_library (png STATIC
+    png.c
+    pngerror.c
+    pngget.c
+    pngmem.c
+    pngpread.c
+    pngread.c
+    pngrio.c
+    pngrtran.c
+    pngrutil.c
+    pngset.c
+    pngtrans.c
+    pngwio.c
+    pngwrite.c
+    pngwtran.c
+    pngwutil.c
+)

diff --git a/zlib/CMakeLists.txt b/zlib/CMakeLists.txt
new file mode 100644 (file)
index 0000000..ff910ce
--- /dev/null
+++ b/zlib/CMakeLists.txt
@@ -0,0 +1,20 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+if (NOT WIN32)
+    add_definitions (-fPIC)
+endif (NOT WIN32)
+
+add_library (zlib STATIC
+    adler32.c
+    compress.c
+    crc32.c
+    gzio.c
+    uncompr.c
+    deflate.c
+    trees.c
+    zutil.c
+    inflate.c
+    infback.c
+    inftrees.c
+    inffast.c
+)