This is an automated email from the ASF dual-hosted git repository. jeremydyer pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git
commit db5a636a708409946c2f9cc300a04ff32840c337 Author: Marc Parisi <[email protected]> AuthorDate: Thu Mar 14 07:52:11 2019 -0400 MINIFICPP-762: Fix windows issues --- CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e79a30f..2d3a5ae 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -249,7 +249,7 @@ endif (OPENSSL_FOUND) else() list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/ssl") endif() -if(NOT USE_SYSTEM_ZLIB) +if(WIN32 OR NOT USE_SYSTEM_ZLIB) message("Using bundled zlib") if (WIN32) @@ -276,10 +276,13 @@ if(NOT USE_SYSTEM_ZLIB) set_target_properties(z PROPERTIES IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR}/${BYPRODUCT}") add_dependencies(z zlib-external) set(ZLIB_FOUND "YES" CACHE STRING "" FORCE) + set(ZLIB_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib/include" CACHE STRING "" FORCE) set(ZLIB_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/zlib/include" CACHE STRING "" FORCE) set(ZLIB_LIBRARIES "${CMAKE_CURRENT_BINARY_DIR}/${BYPRODUCT}" CACHE STRING "" FORCE) set(ZLIB_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/${BYPRODUCT}" CACHE STRING "" FORCE) set(ZLIB_LIBRARY "${CMAKE_CURRENT_BINARY_DIR}/${BYPRODUCT}" CACHE STRING "" FORCE) + set(ZLIB_LIBRARY_RELEASE "${CMAKE_CURRENT_BINARY_DIR}/${BYPRODUCT}" CACHE STRING "" FORCE) + set(ZLIB_LIBRARY_DEBUG "${CMAKE_CURRENT_BINARY_DIR}/${BYPRODUCT}" CACHE STRING "" FORCE) message("ZLIBV LIBR is ${ZLIB_LIBRARIES}") else() find_package (ZLIB REQUIRED) @@ -457,6 +460,10 @@ if(NOT USE_SYSTEM_OPENSSL OR USE_SYSTEM_OPENSSL STREQUAL "OFF") add_dependencies(minifi libressl-portable) endif() +if (WIN32 OR NOT USE_SYSTEM_ZLIB) + add_dependencies(minifi zlib-external) +endif(WIN32 OR NOT USE_SYSTEM_ZLIB) + #### EXTENSIONS option(DISABLE_CURL "Disables libCurl Properties." OFF) if ((DISABLE_CURL STREQUAL "OFF" OR NOT DISABLE_CURL) AND NOT DISABLE_CIVET)
