Merge pull request #2 from OpenCMISS-Dependencies/remove_exec_flag

Remove exec flag
OpenCMISS-Dependencies · Oct 18, 2020 · d6130ca · d6130ca
2 parents 58d6de7 + 6ff4ad4
commit d6130ca
Show file tree

Hide file tree

Showing 174 changed files with 14 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -39,16 +39,17 @@ cmake_minimum_required(VERSION 3.0)
 project(libxml2 LANGUAGES C CXX VERSION 2.7.6)
 
 option(BUILD_TESTS "${PROJECT_NAME} - Build tests" ON)
-option(PACKAGE_CONFIG_DIR "Directory for package config files (relative to CMAKE_INSTALL_PREFIX)" "lib/cmake")
+set(PACKAGE_CONFIG_DIR "lib/cmake" CACHE STRING "Directory for package config files (relative to CMAKE_INSTALL_PREFIX)")
 option(WITH_ZLIB "Build in zlib support" ON)
+option(BUILD_SHARED_LIBS "Build shared library." ON)
 
 if (WITH_ZLIB)
     find_package(ZLIB ${ZLIB_VERSION} REQUIRED)
 endif()
 
 if(NOT BUILD_SHARED_LIBS)
 	set(LIBRARY_INSTALL_TYPE ARCHIVE )
-ELSE()
+else()
 	set(LIBRARY_INSTALL_TYPE LIBRARY )
 	if(WIN32 )
 		set(LIBRARY_INSTALL_TYPE RUNTIME )
@@ -359,6 +360,7 @@ endif()
 install(TARGETS xml2
     EXPORT libxml2-config
 	DESTINATION lib
+	RUNTIME DESTINATION bin
 	INCLUDES DESTINATION include/libxml2)
 install(FILES ${PUBLIC_HDRS}
 	DESTINATION include/libxml2/libxml)
@@ -370,12 +372,21 @@ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-dependencies.cmake
     "include(CMakeFindDependencyMacro)\r\n"
     	"set(${PROJECT_NAME}_IMPORT_PREFIX \${_IMPORT_PREFIX})\r\n")
 if (WITH_ZLIB)
-    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-dependencies.cmake "find_dependency(ZLIB ${ZLIB_VERSION})\r\n")
+    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-dependencies.cmake "set(ZLIB_FIND_SYSTEM ${ZLIB_FIND_SYSTEM})\r\nfind_dependency(ZLIB ${ZLIB_VERSION})\r\n")
 endif()
 file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-dependencies.cmake "set(_IMPORT_PREFIX \${${PROJECT_NAME}_IMPORT_PREFIX})")
 install(FILES 
     ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-version.cmake
     ${CMAKE_CURRENT_BINARY_DIR}/libxml2-config-dependencies.cmake
     DESTINATION ${PACKAGE_CONFIG_DIR})
 
+set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright")
+set(CPACK_NSIS_MODIFY_PATH ON)
+
+include(CPack)
 
diff --git a/check-relaxng-test-suite.py b/check-relaxng-test-suite.py
diff --git a/check-relaxng-test-suite2.py b/check-relaxng-test-suite2.py
diff --git a/check-xinclude-test-suite.py b/check-xinclude-test-suite.py
diff --git a/check-xml-test-suite.py b/check-xml-test-suite.py
diff --git a/check-xsddata-test-suite.py b/check-xsddata-test-suite.py
diff --git a/chvalid.c b/chvalid.c
diff --git a/config.guess b/config.guess
diff --git a/config.sub b/config.sub
diff --git a/configure b/configure
diff --git a/dbgen.pl b/dbgen.pl
diff --git a/dbgenattr.pl b/dbgenattr.pl
diff --git a/depcomp b/depcomp
diff --git a/doc/apibuild.py b/doc/apibuild.py
diff --git a/doc/examples/index.py b/doc/examples/index.py
diff --git a/doc/index.py b/doc/index.py
diff --git a/genUnicode.py b/genUnicode.py
diff --git a/gentest.py b/gentest.py
diff --git a/install-sh b/install-sh
diff --git a/ltmain.sh b/ltmain.sh
diff --git a/missing b/missing
diff --git a/mkinstalldirs b/mkinstalldirs
diff --git a/python/generator.py b/python/generator.py
diff --git a/python/setup.py b/python/setup.py
diff --git a/python/setup.py.in b/python/setup.py.in
diff --git a/python/tests/attribs.py b/python/tests/attribs.py
diff --git a/python/tests/build.py b/python/tests/build.py
diff --git a/python/tests/compareNodes.py b/python/tests/compareNodes.py
diff --git a/python/tests/ctxterror.py b/python/tests/ctxterror.py
diff --git a/python/tests/cutnpaste.py b/python/tests/cutnpaste.py
diff --git a/python/tests/dtdvalid.py b/python/tests/dtdvalid.py
diff --git a/python/tests/error.py b/python/tests/error.py
diff --git a/python/tests/inbuf.py b/python/tests/inbuf.py
diff --git a/python/tests/indexes.py b/python/tests/indexes.py
diff --git a/python/tests/nsdel.py b/python/tests/nsdel.py
diff --git a/python/tests/outbuf.py b/python/tests/outbuf.py
diff --git a/python/tests/push.py b/python/tests/push.py
diff --git a/python/tests/pushSAX.py b/python/tests/pushSAX.py
diff --git a/python/tests/pushSAXhtml.py b/python/tests/pushSAXhtml.py
diff --git a/python/tests/reader.py b/python/tests/reader.py
diff --git a/python/tests/reader2.py b/python/tests/reader2.py
diff --git a/python/tests/reader3.py b/python/tests/reader3.py
diff --git a/python/tests/reader4.py b/python/tests/reader4.py
diff --git a/python/tests/reader5.py b/python/tests/reader5.py
diff --git a/python/tests/reader6.py b/python/tests/reader6.py
diff --git a/python/tests/reader7.py b/python/tests/reader7.py
diff --git a/python/tests/reader8.py b/python/tests/reader8.py
diff --git a/python/tests/readernext.py b/python/tests/readernext.py
diff --git a/python/tests/relaxng.py b/python/tests/relaxng.py
diff --git a/python/tests/resolver.py b/python/tests/resolver.py
diff --git a/python/tests/schema.py b/python/tests/schema.py
diff --git a/python/tests/serialize.py b/python/tests/serialize.py
diff --git a/python/tests/sync.py b/python/tests/sync.py
diff --git a/python/tests/thread2.py b/python/tests/thread2.py
diff --git a/python/tests/tst.py b/python/tests/tst.py
diff --git a/python/tests/tstLastError.py b/python/tests/tstLastError.py
diff --git a/python/tests/tstURI.py b/python/tests/tstURI.py
diff --git a/python/tests/tstmem.py b/python/tests/tstmem.py
diff --git a/python/tests/tstxpath.py b/python/tests/tstxpath.py
diff --git a/python/tests/validDTD.py b/python/tests/validDTD.py
diff --git a/python/tests/validRNG.py b/python/tests/validRNG.py
diff --git a/python/tests/validSchemas.py b/python/tests/validSchemas.py
diff --git a/python/tests/validate.py b/python/tests/validate.py
diff --git a/python/tests/walker.py b/python/tests/walker.py
diff --git a/python/tests/xpath.py b/python/tests/xpath.py
diff --git a/python/tests/xpathext.py b/python/tests/xpathext.py
diff --git a/python/tests/xpathns.py b/python/tests/xpathns.py
diff --git a/python/tests/xpathret.py b/python/tests/xpathret.py
diff --git a/regressions.py b/regressions.py
diff --git a/result/c14n/1-1-without-comments/example-1 b/result/c14n/1-1-without-comments/example-1
diff --git a/result/c14n/1-1-without-comments/example-2 b/result/c14n/1-1-without-comments/example-2
diff --git a/result/c14n/1-1-without-comments/example-3 b/result/c14n/1-1-without-comments/example-3
diff --git a/result/c14n/1-1-without-comments/example-4 b/result/c14n/1-1-without-comments/example-4
diff --git a/result/c14n/1-1-without-comments/example-5 b/result/c14n/1-1-without-comments/example-5
diff --git a/result/c14n/1-1-without-comments/example-6 b/result/c14n/1-1-without-comments/example-6
diff --git a/result/c14n/1-1-without-comments/example-7 b/result/c14n/1-1-without-comments/example-7
diff --git a/result/c14n/1-1-without-comments/example-8 b/result/c14n/1-1-without-comments/example-8
diff --git a/test/SVG/4rects.xml b/test/SVG/4rects.xml
diff --git a/test/SVG/a-valid.xml b/test/SVG/a-valid.xml
diff --git a/test/SVG/a-wf.xml b/test/SVG/a-wf.xml
diff --git a/test/SVG/bike.xml b/test/SVG/bike.xml
diff --git a/test/SVG/circle.xml b/test/SVG/circle.xml
diff --git a/test/SVG/defs.xml b/test/SVG/defs.xml
diff --git a/test/SVG/desc.xml b/test/SVG/desc.xml
diff --git a/test/SVG/ellipse.xml b/test/SVG/ellipse.xml
diff --git a/test/SVG/flower2.xml b/test/SVG/flower2.xml
diff --git a/test/SVG/gradient.xml b/test/SVG/gradient.xml
diff --git a/test/SVG/group01.xml b/test/SVG/group01.xml
diff --git a/test/SVG/group02.xml b/test/SVG/group02.xml
diff --git a/test/SVG/group03.xml b/test/SVG/group03.xml
diff --git a/test/SVG/image-valid.xml b/test/SVG/image-valid.xml
diff --git a/test/SVG/image-wf.xml b/test/SVG/image-wf.xml
diff --git a/test/SVG/lin-gradient.xml b/test/SVG/lin-gradient.xml
diff --git a/test/SVG/marker.xml b/test/SVG/marker.xml
diff --git a/test/SVG/mask.xml b/test/SVG/mask.xml
diff --git a/test/SVG/mathswitch.xml b/test/SVG/mathswitch.xml
diff --git a/test/SVG/parentns.xml b/test/SVG/parentns.xml
diff --git a/test/SVG/path01.xml b/test/SVG/path01.xml
diff --git a/test/SVG/path02.xml b/test/SVG/path02.xml
diff --git a/test/SVG/patternfill.xml b/test/SVG/patternfill.xml
diff --git a/test/SVG/polyline.xml b/test/SVG/polyline.xml
diff --git a/test/SVG/private.xml b/test/SVG/private.xml
diff --git a/test/SVG/rad-gradient.xml b/test/SVG/rad-gradient.xml
diff --git a/test/SVG/rectangle.xml b/test/SVG/rectangle.xml
diff --git a/test/SVG/richdesc.xml b/test/SVG/richdesc.xml
diff --git a/test/SVG/script.xml b/test/SVG/script.xml
diff --git a/test/SVG/structure01.xml b/test/SVG/structure01.xml
diff --git a/test/SVG/style.xml b/test/SVG/style.xml
diff --git a/test/SVG/switch.xml b/test/SVG/switch.xml
diff --git a/test/SVG/symbol-use.xml b/test/SVG/symbol-use.xml
diff --git a/test/SVG/template.xml b/test/SVG/template.xml
diff --git a/test/SVG/text01.xml b/test/SVG/text01.xml
diff --git a/test/SVG/text02.xml b/test/SVG/text02.xml
diff --git a/test/SVG/text03.xml b/test/SVG/text03.xml
diff --git a/test/SVG/toap01.xml b/test/SVG/toap01.xml
diff --git a/test/SVG/toap02.xml b/test/SVG/toap02.xml
diff --git a/test/SVG/transform.xml b/test/SVG/transform.xml
diff --git a/test/SVG/trivial.xml b/test/SVG/trivial.xml
diff --git a/test/SVG/twin-gradients.xml b/test/SVG/twin-gradients.xml
diff --git a/test/SVG/v-template.xml b/test/SVG/v-template.xml
diff --git a/test/SVG/viewport-nest.xml b/test/SVG/viewport-nest.xml
diff --git a/test/SVG/viewport-transform.xml b/test/SVG/viewport-transform.xml
diff --git a/test/SVG/viewport.xml b/test/SVG/viewport.xml
diff --git a/test/SVG/wf-template.xml b/test/SVG/wf-template.xml
diff --git a/test/c14n/1-1-without-comments/doc.dtd b/test/c14n/1-1-without-comments/doc.dtd
diff --git a/test/c14n/1-1-without-comments/example-1.xml b/test/c14n/1-1-without-comments/example-1.xml
diff --git a/test/c14n/1-1-without-comments/example-2.xml b/test/c14n/1-1-without-comments/example-2.xml
diff --git a/test/c14n/1-1-without-comments/example-3.xml b/test/c14n/1-1-without-comments/example-3.xml
diff --git a/test/c14n/1-1-without-comments/example-4.xml b/test/c14n/1-1-without-comments/example-4.xml
diff --git a/test/c14n/1-1-without-comments/example-5.xml b/test/c14n/1-1-without-comments/example-5.xml
diff --git a/test/c14n/1-1-without-comments/example-6.xml b/test/c14n/1-1-without-comments/example-6.xml
diff --git a/test/c14n/1-1-without-comments/example-7.xml b/test/c14n/1-1-without-comments/example-7.xml
diff --git a/test/c14n/1-1-without-comments/example-7.xpath b/test/c14n/1-1-without-comments/example-7.xpath
diff --git a/test/c14n/1-1-without-comments/example-8.xml b/test/c14n/1-1-without-comments/example-8.xml
diff --git a/test/c14n/1-1-without-comments/example-8.xpath b/test/c14n/1-1-without-comments/example-8.xpath
diff --git a/test/c14n/1-1-without-comments/world.txt b/test/c14n/1-1-without-comments/world.txt
diff --git a/test/c14n/1-1-without-comments/xmlbase-prop-1.xml b/test/c14n/1-1-without-comments/xmlbase-prop-1.xml
diff --git a/test/c14n/1-1-without-comments/xmlbase-prop-1.xpath b/test/c14n/1-1-without-comments/xmlbase-prop-1.xpath
diff --git a/test/c14n/1-1-without-comments/xmlbase-prop-2.xml b/test/c14n/1-1-without-comments/xmlbase-prop-2.xml
diff --git a/test/c14n/1-1-without-comments/xmlbase-prop-2.xpath b/test/c14n/1-1-without-comments/xmlbase-prop-2.xpath
diff --git a/test/c14n/1-1-without-comments/xmlbase-prop-3.xml b/test/c14n/1-1-without-comments/xmlbase-prop-3.xml
diff --git a/test/c14n/1-1-without-comments/xmlbase-prop-3.xpath b/test/c14n/1-1-without-comments/xmlbase-prop-3.xpath
diff --git a/test/c14n/1-1-without-comments/xmlbase-prop-4.xml b/test/c14n/1-1-without-comments/xmlbase-prop-4.xml
diff --git a/test/c14n/1-1-without-comments/xmlbase-prop-4.xpath b/test/c14n/1-1-without-comments/xmlbase-prop-4.xpath
diff --git a/test/c14n/1-1-without-comments/xmlbase-prop-5.xml b/test/c14n/1-1-without-comments/xmlbase-prop-5.xml
diff --git a/test/c14n/1-1-without-comments/xmlbase-prop-5.xpath b/test/c14n/1-1-without-comments/xmlbase-prop-5.xpath
diff --git a/test/c14n/1-1-without-comments/xmlbase-prop-6.xml b/test/c14n/1-1-without-comments/xmlbase-prop-6.xml
diff --git a/test/c14n/1-1-without-comments/xmlbase-prop-6.xpath b/test/c14n/1-1-without-comments/xmlbase-prop-6.xpath
diff --git a/test/c14n/1-1-without-comments/xmlbase-prop-7.xml b/test/c14n/1-1-without-comments/xmlbase-prop-7.xml
diff --git a/test/c14n/1-1-without-comments/xmlbase-prop-7.xpath b/test/c14n/1-1-without-comments/xmlbase-prop-7.xpath
diff --git a/test/c14n/1-1-without-comments/xmlid-prop-1.xpath b/test/c14n/1-1-without-comments/xmlid-prop-1.xpath
diff --git a/test/c14n/1-1-without-comments/xmlid-prop-2.xpath b/test/c14n/1-1-without-comments/xmlid-prop-2.xpath
diff --git a/test/c14n/1-1-without-comments/xmllang-prop-1.xpath b/test/c14n/1-1-without-comments/xmllang-prop-1.xpath
diff --git a/test/c14n/1-1-without-comments/xmllang-prop-2.xpath b/test/c14n/1-1-without-comments/xmllang-prop-2.xpath
diff --git a/test/c14n/1-1-without-comments/xmllang-prop-3.xpath b/test/c14n/1-1-without-comments/xmllang-prop-3.xpath
diff --git a/test/c14n/1-1-without-comments/xmllang-prop-4.xpath b/test/c14n/1-1-without-comments/xmllang-prop-4.xpath
diff --git a/test/c14n/1-1-without-comments/xmlspace-prop-1.xpath b/test/c14n/1-1-without-comments/xmlspace-prop-1.xpath
diff --git a/test/c14n/1-1-without-comments/xmlspace-prop-2.xpath b/test/c14n/1-1-without-comments/xmlspace-prop-2.xpath
diff --git a/test/c14n/1-1-without-comments/xmlspace-prop-3.xpath b/test/c14n/1-1-without-comments/xmlspace-prop-3.xpath
diff --git a/test/c14n/1-1-without-comments/xmlspace-prop-4.xpath b/test/c14n/1-1-without-comments/xmlspace-prop-4.xpath
diff --git a/test/schemas/any6_0.xml b/test/schemas/any6_0.xml
diff --git a/test/schemas/any7_0.xml b/test/schemas/any7_0.xml
diff --git a/test/schemas/any7_1.xml b/test/schemas/any7_1.xml
diff --git a/test/schemas/any7_1.xsd b/test/schemas/any7_1.xsd
diff --git a/test/schemas/any7_2.xsd b/test/schemas/any7_2.xsd
diff --git a/test/schemas/bug152470_1.xml b/test/schemas/bug152470_1.xml
diff --git a/test/schemas/bug152470_1.xsd b/test/schemas/bug152470_1.xsd
diff --git a/test/schemas/import-bad-1_0.imp b/test/schemas/import-bad-1_0.imp
diff --git a/test/schemas/vdv-first4_0.xsd b/test/schemas/vdv-first4_0.xsd
diff --git a/test/valid/dtds/spec.dtd b/test/valid/dtds/spec.dtd
diff --git a/vms/build_libxml.com b/vms/build_libxml.com
diff --git a/vms/config.vms b/vms/config.vms
diff --git a/xstc/xstc-to-python.xsl b/xstc/xstc-to-python.xsl
diff --git a/xstc/xstc.py b/xstc/xstc.py