Bootstrappable builds (WIP)

cmake/Deploy.cmake

@@ -5,6 +5,7 @@ if(APPLE OR (WIN32 AND NOT STATIC))
 
     if(APPLE AND NOT IOS)
         find_program(MACDEPLOYQT_EXECUTABLE macdeployqt HINTS "${_qt_bin_dir}")
+        MESSAGE(INFO "MACDEPLOY ${MACDEPLOYQT_EXECUTABLE}")
         add_custom_command(TARGET deploy
                 POST_BUILD
                 COMMAND "${MACDEPLOYQT_EXECUTABLE}" "$<TARGET_FILE_DIR:feather>/../.." -always-overwrite

cmake/FindZBAR.cmake

@@ -9,14 +9,6 @@ if(PkgConfig_FOUND)
     endif()
 endif()
 
-if(NOT ZBAR_LIBRARIES AND ANDROID)
-    find_library(ZBARJNI_LIBRARY NAMES zbarjni)
-    find_library(ICONV_LIBRARY NAMES iconv)
-    if(ZBARJNI_LIBRARY AND ICONV_LIBRARY)
-        set(ZBAR_LIBRARIES ${ZBARJNI_LIBRARY} ${ICONV_LIBRARY})
-    endif()
-endif()
-
 if(NOT ZBAR_INCLUDE_DIR)
     find_path(ZBAR_H_PATH zbar.h)
     if(ZBAR_H_PATH)

cmake/FindZLIB.cmake

@@ -87,7 +87,7 @@ if(NOT ZLIB_LIBRARY)
         find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} NAMES_PER_DIR ${${search}} PATH_SUFFIXES lib)
     endforeach()
 
-    include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
+    include(SelectLibraryConfigurations)
     select_library_configurations(ZLIB)
 endif()
 
@@ -116,7 +116,7 @@ if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
     set(ZLIB_PATCH_VERSION "${ZLIB_VERSION_PATCH}")
 endif()
 
-include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB REQUIRED_VARS ZLIB_LIBRARY ZLIB_INCLUDE_DIR
         VERSION_VAR ZLIB_VERSION_STRING)
 
@@ -151,4 +151,6 @@ if(ZLIB_FOUND)
                     IMPORTED_LOCATION "${ZLIB_LIBRARY}")
         endif()
     endif()
+
+    message(STATUS "Found zlib libraries ${ZLIB_LIBRARIES}")
 endif()

cmake/FindZlib.cmake

@@ -0,0 +1,21 @@
+find_package(PkgConfig)
+
+if(PkgConfig_FOUND)
+    pkg_check_modules(PC_ZLIB QUIET ZLIB)
+    if(PC_ZLIB_FOUND)
+        set(ZLIB_DEFINITIONS ${PC_ZLIB_CFLAGS_OTHER})
+        find_library(ZLIB_LIBRARIES NAMES ZLIB HINTS ${PC_ZLIB_LIBDIR} ${PC_ZLIB_LIBRARY_DIRS})
+        find_path(ZLIB_INCLUDE_DIR Decoder.h HINTS ${PC_ZLIB_INCLUDEDIR} ${PC_ZLIB_INCLUDE_DIRS})
+    endif()
+endif()
+
+if(NOT ZLIB_INCLUDE_DIR)
+    find_path(ZLIB_H_PATH ZLIB.h)
+    if(ZLIB_H_PATH)
+        set(ZLIB_INCLUDE_DIR "${ZLIB_H_PATH}")
+    endif()
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(ZLIB  DEFAULT_MSG  ZLIB_LIBRARIES ZLIB_INCLUDE_DIR)
+message(STATUS "Found ZLIB libraries ${ZLIB_LIBRARIES}")

cmake/GenVersion.cmake

@@ -1,5 +1,5 @@
 # Copyright (c) 2014-2019, The Monero Project
-# 
+#
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without modification, are