[many ports] Updates 2019.05.24 (#6618)
* [many ports] Updates 2019.05.24
* Update SHA512 and resolve conflict for ebml and matroska
* [avro-c]Fix build error caused by jansson upgrades.
* [xxhash]Update to the next version to fix build error.(xxhash issue:#179)
* Fix failures and undo asio
* [libyaml, grpc, miniz, paho-mqtt, sqlitecpp] Update patches
* Update REF
* Undo nvtt flann itk libtins aws-sdk-cpp openvdb vlpp xmsh changes
* [flann, fastcdr] Fix old patches and build error.
* [flann, fastcdr] Fix build error.
* Fix ensmallen uvatlas cppcms libplist failures and undo aws-c-common libopusenc arb taglib changes
* [dcmtk, draco, flatbuffers, forge, ftgl, mosquitto,nmslib, ogre] Update old patches and fix build error.
* fix libusbmuxd failures and undo xxhash paho-mqtt mongo-c-driver flann libffi
* fix libimobiledevice and undo qhull harfbuzz lcm libbson draco flatbuffers
* undo libmupdf forge kd-soap qca
* [mosquitto] Fix installation of import libs
* [arb][asio][aws-c-common][collada-dom][concurrentqueue][cryptopp][ebml] Revert trivial/undesired changes
* [fastcdr] Minimize patch
* [many ports] Revert trivial changes
* [libyaml] Switch to non-dist tag
* [sqlite-modern-cpp] Track master due to infrequent release
* [nano-signal-slot] Revert downgrade
* [openvpn3] Bump control version to account for portfile change
* [sqlite-modern-cpp] Fixup wrong hash
* [mosquitto] Commit missing patch
2019-06-11 08:01:54 +08:00
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
|
|
index f3e453a..094a4e8 100644
|
|
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
|
|
|
|
@@ -8,13 +8,12 @@ if(CMAKE_BUILD_TYPE STREQUAL "")
|
|
|
|
|
CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel." FORCE)
|
|
|
|
|
endif ()
|
|
|
|
|
|
|
|
|
|
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
|
|
|
|
|
-
|
|
|
|
|
set(miniz_SOURCE miniz.c miniz_zip.c miniz_tinfl.c miniz_tdef.c)
|
|
|
|
|
|
|
|
|
|
-add_library(miniz ${miniz_SOURCE})
|
|
|
|
|
-target_include_directories(miniz PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
|
|
|
|
|
-
|
|
|
|
|
+add_library(miniz STATIC ${miniz_SOURCE})
|
|
|
|
|
+target_compile_definitions(miniz PRIVATE _CRT_SECURE_NO_WARNINGS)
|
|
|
|
|
+
|
|
|
|
|
+if(FALSE)
|
|
|
|
|
set(EXAMPLE1_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example1.c")
|
|
|
|
|
set(EXAMPLE2_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example2.c")
|
|
|
|
|
set(EXAMPLE3_SRC_LIST "${CMAKE_CURRENT_SOURCE_DIR}/examples/example3.c")
|
|
|
|
|
@@ -41,12 +40,28 @@ if(${UNIX})
|
|
|
|
|
target_link_libraries(example6 m)
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
+target_compile_definitions(example1 PRIVATE _CRT_SECURE_NO_WARNINGS)
|
|
|
|
|
+target_compile_definitions(example2 PRIVATE _CRT_SECURE_NO_WARNINGS)
|
|
|
|
|
+target_compile_definitions(example3 PRIVATE _CRT_SECURE_NO_WARNINGS)
|
|
|
|
|
+target_compile_definitions(example4 PRIVATE _CRT_SECURE_NO_WARNINGS)
|
|
|
|
|
+target_compile_definitions(example5 PRIVATE _CRT_SECURE_NO_WARNINGS)
|
|
|
|
|
+target_compile_definitions(example6 PRIVATE _CRT_SECURE_NO_WARNINGS)
|
|
|
|
|
+
|
|
|
|
|
# add_executable(miniz_tester ${MINIZ_TESTER_SRC_LIST})
|
|
|
|
|
# target_link_libraries(miniz_tester miniz)
|
|
|
|
|
+endif()
|
|
|
|
|
|
|
|
|
|
-install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Targets
|
|
|
|
|
- ARCHIVE DESTINATION lib
|
|
|
|
|
- LIBRARY DESTINATION lib
|
|
|
|
|
+install(TARGETS ${PROJECT_NAME} EXPORT ${PROJECT_NAME}Config
|
|
|
|
|
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
|
|
|
+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
|
|
|
)
|
|
|
|
|
+export(TARGETS ${PROJECT_NAME}
|
|
|
|
|
+ NAMESPACE miniz::
|
|
|
|
|
+ FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake"
|
|
|
|
|
+)
|
|
|
|
|
+install(EXPORT ${PROJECT_NAME}Config
|
|
|
|
|
+ DESTINATION "${CMAKE_INSTALL_PREFIX}/share/miniz"
|
|
|
|
|
+ NAMESPACE miniz::
|
|
|
|
|
+)
|
|
|
|
|
file(GLOB INSTALL_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/*.h)
|
|
|
|
|
install(FILES ${INSTALL_HEADERS} DESTINATION include/${PROJECT_NAME})
|
|
|
|
|
\ No newline at end of file
|