Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/external/mit/expat/dist/CMakeLists.txt,v rcsdiff: /ftp/cvs/cvsroot/src/external/mit/expat/dist/CMakeLists.txt,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.1.1.1.12.1 retrieving revision 1.1.1.1.12.2 diff -u -p -r1.1.1.1.12.1 -r1.1.1.1.12.2 --- src/external/mit/expat/dist/CMakeLists.txt 2016/05/18 09:14:14 1.1.1.1.12.1 +++ src/external/mit/expat/dist/CMakeLists.txt 2017/02/19 04:53:23 1.1.1.1.12.2 @@ -6,7 +6,7 @@ project(expat) cmake_minimum_required(VERSION 2.6) set(PACKAGE_BUGREPORT "expat-bugs@libexpat.org") set(PACKAGE_NAME "expat") -set(PACKAGE_VERSION "2.1.1") +set(PACKAGE_VERSION "2.2.0") set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}") set(PACKAGE_TARNAME "${PACKAGE_NAME}") @@ -41,6 +41,10 @@ include_directories(${CMAKE_BINARY_DIR} if(MSVC) add_definitions(-D_CRT_SECURE_NO_WARNINGS -wd4996) endif(MSVC) +if(WIN32) + add_definitions(-DWIN32) + set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "Add a suffix, usually d on Windows") +endif(WIN32) set(expat_SRCS lib/xmlparse.c @@ -50,18 +54,31 @@ set(expat_SRCS lib/xmltok_ns.c ) -if(WIN32 AND BUILD_shared) - set(expat_SRCS ${expat_SRCS} lib/libexpat.def) -endif(WIN32 AND BUILD_shared) - if(BUILD_shared) set(_SHARED SHARED) + if(WIN32) + set(expat_SRCS ${expat_SRCS} lib/libexpat.def) + endif(WIN32) else(BUILD_shared) set(_SHARED STATIC) + if(WIN32) + add_definitions(-DXML_STATIC) + endif(WIN32) endif(BUILD_shared) add_library(expat ${_SHARED} ${expat_SRCS}) +set(LIBCURRENT 7) # sync +set(LIBREVISION 2) # with +set(LIBAGE 6) # configure.ac! +math(EXPR LIBCURRENT_MINUS_AGE "${LIBCURRENT} - ${LIBAGE}") + +if(NOT WIN32) + set_property(TARGET expat PROPERTY VERSION ${LIBCURRENT_MINUS_AGE}.${LIBAGE}.${LIBREVISION}) + set_property(TARGET expat PROPERTY SOVERSION ${LIBCURRENT_MINUS_AGE}) + set_property(TARGET expat PROPERTY NO_SONAME ${NO_SONAME}) +endif(NOT WIN32) + install(TARGETS expat RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) @@ -76,6 +93,7 @@ install(FILES lib/expat.h lib/expat_exte install(FILES ${CMAKE_CURRENT_BINARY_DIR}/expat.pc DESTINATION lib/pkgconfig) +add_custom_command(TARGET expat PRE_BUILD COMMAND $(MAKE) -C doc xmlwf.1) if(BUILD_tools AND NOT WINCE) set(xmlwf_SRCS