Remove cppan build. Add sw build to cmake.

.gitignore

@@ -20,6 +20,7 @@
 *.log
 *.o
 *.pc
+*.lnk
 .deps
 .libs
 makefile

CMakeLists.txt

@@ -48,14 +48,10 @@ set(VERSION_PLAIN ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 set(MINIMUM_WEBPMUX_VERSION 0.5.0)
 
 option(BUILD_PROG "Build utility programs" OFF)
-option(CPPAN_BUILD "Build with cppan" ON)
+option(SW_BUILD "Build with sw" ON)
 option(SYM_LINK "Create symlink leptonica -> lept on UNIX" OFF)
 
-if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.cppan)
-    set(CPPAN_BUILD OFF)
-endif()
-
-if(NOT CPPAN_BUILD)
+if(NOT SW_BUILD)
     find_package(GIF)
     find_package(JPEG)
     find_package(PNG)
@@ -105,8 +101,17 @@ if(NOT CPPAN_BUILD)
              set(HAVE_LIBJP2K 1)
         endif()
     endif()
-else()  # CPPAN_BUILD=ON
-    add_subdirectory(.cppan)
+else() # SW_BUILD=ON
+    find_package(SW REQUIRED)
+    sw_add_package(
+        org.sw.demo.gif
+        org.sw.demo.jpeg
+        org.sw.demo.glennrp.png
+        org.sw.demo.tiff
+        org.sw.demo.webmproject.webp
+        org.sw.demo.uclouvain.openjpeg.openjp2
+    )
+    sw_execute()
 
     add_definitions(
         -DHAVE_LIBGIF=1
@@ -197,9 +202,9 @@ message( STATUS "C compiler options: ${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UP}} ${C
 message( STATUS "Linker options: ${CMAKE_EXE_LINKER_FLAGS} ${CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE_UP}}")
 message( STATUS "Install directory: ${CMAKE_INSTALL_PREFIX}")
 message( STATUS )
-message( STATUS "Build with cppan [CPPAN_BUILD]: ${CPPAN_BUILD}")
+message( STATUS "Build with sw [SW_BUILD]: ${SW_BUILD}")
 message( STATUS "Build utility programs [BUILD_PROG]: ${BUILD_PROG}")
-if(NOT CPPAN_BUILD)
+if(NOT SW_BUILD)
     message( STATUS "Used ZLIB library: ${ZLIB_LIBRARIES}")
     message( STATUS "Used PNG library:  ${PNG_LIBRARIES}")
     message( STATUS "Used JPEG library: ${JPEG_LIBRARIES}")

cppan.yml

@@ -1,76 +0,0 @@
-type: lib
-
-files:
-    - src/.*\.h
-    - src/.*\.c
-    - src/endianness.h.in
-
-include_directories:
-    public: src
-
-check_function_exists:
-  - fmemopen
-  - fstatat
-
-check_include_exists:
-  - dlfcn.h
-  - inttypes.h
-  - memory.h
-  - stdint.h
-  - stdlib.h
-  - strings.h
-  - string.h
-  - sys/stat.h
-  - sys/types.h
-  - unistd.h
-
-pre_sources: |
-    if(WORDS_BIGENDIAN)
-      set(ENDIANNESS L_BIG_ENDIAN)
-    else()
-      set(ENDIANNESS L_LITTLE_ENDIAN)
-    endif()
-
-    set(APPLE_UNIVERSAL_BUILD "defined (__APPLE_CC__)")
-    configure_file(
-        ${SDIR}/src/endianness.h.in
-        ${BDIR}/endianness.h
-        @ONLY)
-
-    # dummy config file
-    if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/config_auto.h)
-        file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/config_auto.h)
-    endif()
-
-post_sources: |
-    if (MSVC)
-        file(GLOB_RECURSE csrc "${SDIR}/*.c")
-        set_source_files_properties(${csrc} PROPERTIES LANGUAGE CXX)
-    endif()
-
-options:
-    any:
-        definitions:
-            public:
-              - HAVE_CONFIG_H
-            private:
-              - HAVE_LIBGIF
-              - HAVE_LIBJPEG
-              - HAVE_LIBPNG
-              - HAVE_LIBTIFF
-              - HAVE_LIBWEBP
-              - HAVE_LIBZ
-              - HAVE_LIBJP2K
-              - LIBJP2K_HEADER="openjpeg.h"
-    shared:
-        definitions:
-            private: LIBLEPT_EXPORTS
-
-dependencies:
-    private:
-        pvt.cppan.demo.gif: 5
-        pvt.cppan.demo.jpeg: 9
-        pvt.cppan.demo.png: 1
-        pvt.cppan.demo.tiff: 4
-        pvt.cppan.demo.webmproject.webp: 1
-        pvt.cppan.demo.openjpeg.openjp2: 2

src/CMakeLists.txt

@@ -74,16 +74,16 @@ if (UNIX)
     endif(SYM_LINK)
 endif()
 
-if (NOT CPPAN_BUILD)
+if (NOT SW_BUILD)
     export(TARGETS leptonica FILE ${CMAKE_BINARY_DIR}/LeptonicaTargets.cmake)
 else()
     target_link_libraries       (leptonica
-        pvt.cppan.demo.gif
-        pvt.cppan.demo.jpeg
-        pvt.cppan.demo.png
-        pvt.cppan.demo.tiff
-        pvt.cppan.demo.webmproject.webp
-        pvt.cppan.demo.openjpeg.openjp2
+        org.sw.demo.gif
+        org.sw.demo.jpeg
+        org.sw.demo.glennrp.png
+        org.sw.demo.tiff
+        org.sw.demo.webmproject.webp
+        org.sw.demo.uclouvain.openjpeg.openjp2
     )
     file(WRITE ${CMAKE_BINARY_DIR}/LeptonicaTargets.cmake "include(${CMAKE_BINARY_DIR}/cppan.cmake)\n")
     export(TARGETS leptonica APPEND FILE ${CMAKE_BINARY_DIR}/LeptonicaTargets.cmake)