diff options
| author | Markus Rickert <rickert@fortiss.org> | 2020-06-07 16:38:37 +0200 |
|---|---|---|
| committer | Markus Rickert <rickert@fortiss.org> | 2020-07-12 18:40:18 +0200 |
| commit | 18ae2b0b76a37805acd3d66c2a96a83644dff183 (patch) | |
| tree | d656eecb4fccf48a1b2d90c69b63e82f9642f710 | |
| parent | a59b1d823cb76ad70e56feaed77b3a7f28350734 (diff) | |
| download | libxslt-18ae2b0b76a37805acd3d66c2a96a83644dff183.tar.gz | |
Update config.h.cmake.in
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | config.h.cmake.in | 17 |
2 files changed, 9 insertions, 20 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fabc669f..6b952b2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ set(VERSION ${LIBXSLT_DOTTED_VERSION}) set(LIBEXSLT_VERSION ${LIBEXSLT_DOTTED_VERSION}) find_package(Iconv) -find_package(LibXml2) +find_package(LibXml2 REQUIRED) find_package(Python2 COMPONENTS Interpreter Development) find_package(Threads) @@ -125,7 +125,7 @@ else() check_function_exists(vsprintf HAVE_VSPRINTF) check_include_files(xlocale.h HAVE_XLOCALE_H) check_function_exists(_stat HAVE__STAT) - #LT_OBJDIR + set(LT_OBJDIR ".libs/") set(PACKAGE "libxslt") set(PACKAGE_BUGREPORT "xml@gnome.org") set(PACKAGE_NAME "libxslt") @@ -133,7 +133,7 @@ else() set(PACKAGE_TARNAME "libxslt") set(PACKAGE_URL "http://www.xmlsoft.org/libxslt") set(PACKAGE_VERSION ${LIBXSLT_DOTTED_VERSION}) - check_include_files("assert.h;ctype.h;errno.h;float.h;limits.h;locale.h;math.h;setjmp.h;signal.h;stdarg.h;stddef.h;stdio.h;stdlib.h;string.h;time.h" STDC_HEADERS) + check_include_files("float.h;stdarg.h;stdlib.h;string.h" STDC_HEADERS) set(_ALL_SOURCE ON) set(_GNU_SOURCE ON) set(_POSIX_PTHREAD_SEMANTICS ON) @@ -148,12 +148,6 @@ else() set(_POSIX_1_SOURCE ON) set(_POSIX_SOURCE ON) endif() - if(WIN32) - add_definitions(-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x501) - set(_WINSOCKAPI_ 1) - endif() - #snprintf - #vsnprintf configure_file(config.h.cmake.in config.h) endif() diff --git a/config.h.cmake.in b/config.h.cmake.in index 52a3b63f..41607777 100644 --- a/config.h.cmake.in +++ b/config.h.cmake.in @@ -1,4 +1,5 @@ -/* config.h.in. Generated from configure.in by autoheader. */ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ /* Define to 1 if you have the `clock_gettime' function. */ #cmakedefine HAVE_CLOCK_GETTIME 1 @@ -145,7 +146,7 @@ #cmakedefine HAVE__STAT 1 /* Define to the sub-directory where libtool stores uninstalled libraries. */ -#cmakedefine LT_OBJDIR @LT_OBJDIR@ +#cmakedefine LT_OBJDIR "@LT_OBJDIR@" /* Name of package */ #cmakedefine PACKAGE "@PACKAGE@" @@ -199,6 +200,9 @@ /* Define if debugging support is enabled */ #cmakedefine WITH_DEBUGGER 1 +/* Define if profiling support is enabled */ +#cmakedefine WITH_PROFILER 1 + /* Define to 1 if on MINIX. */ #cmakedefine _MINIX 1 @@ -208,12 +212,3 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #cmakedefine _POSIX_SOURCE 1 - -/* Using the Win32 Socket implementation */ -#cmakedefine _WINSOCKAPI_ 1 - -/* Win32 Std C name mangling work-around */ -#cmakedefine snprintf - -/* Win32 Std C name mangling work-around */ -#cmakedefine vsnprintf |