diff options
| -rw-r--r-- | CMakeScripts/ConfigChecks.cmake | 19 | ||||
| -rw-r--r-- | CMakeScripts/ConfigEnv.cmake | 2 | ||||
| -rw-r--r-- | CMakeScripts/ConfigPaths.cmake | 2 | ||||
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 6 | ||||
| -rw-r--r-- | config.h.cmake | 134 |
5 files changed, 19 insertions, 144 deletions
diff --git a/CMakeScripts/ConfigChecks.cmake b/CMakeScripts/ConfigChecks.cmake index ef11542b0..123263ff4 100644 --- a/CMakeScripts/ConfigChecks.cmake +++ b/CMakeScripts/ConfigChecks.cmake @@ -14,40 +14,21 @@ set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ${INKSCAPE_LIBS}) set(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${INKSCAPE_INCS_SYS}) CHECK_INCLUDE_FILES(cairo-pdf.h HAVE_CAIRO_PDF) -CHECK_FUNCTION_EXISTS(floor HAVE_FLOOR) CHECK_FUNCTION_EXISTS(fpsetmask HAVE_FPSETMASK) -CHECK_FUNCTION_EXISTS(gettimeofday HAVE_GETTIMEOFDAY) CHECK_INCLUDE_FILES(ieeefp.h HAVE_IEEEFP_H) -CHECK_INCLUDE_FILES(inttypes.h HAVE_INTTYPES_H) -CHECK_INCLUDE_FILES(fcntl.h HAVE_FCNTL_H) CHECK_FUNCTION_EXISTS(mallinfo HAVE_MALLINFO) CHECK_INCLUDE_FILES(malloc.h HAVE_MALLOC_H) -CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE) -CHECK_INCLUDE_FILES(memory.h HAVE_MEMORY_H) -CHECK_FUNCTION_EXISTS(memset HAVE_MEMSET) -CHECK_FUNCTION_EXISTS(pow HAVE_POW) -CHECK_FUNCTION_EXISTS(sqrt HAVE_SQRT) CHECK_INCLUDE_FILES(stdint.h HAVE_STDINT_H) -CHECK_FUNCTION_EXISTS(strpbrk HAVE_STRPBRK) -CHECK_FUNCTION_EXISTS(strrchr HAVE_STRRCHR) -CHECK_FUNCTION_EXISTS(strspn HAVE_STRSPN) -CHECK_FUNCTION_EXISTS(strstr HAVE_STRSTR) -CHECK_FUNCTION_EXISTS(strtoul HAVE_STRTOUL) CHECK_STRUCT_HAS_MEMBER(fordblks mallinfo malloc.h HAVE_STRUCT_MALLINFO_FORDBLKS) CHECK_STRUCT_HAS_MEMBER(fsmblks mallinfo malloc.h HAVE_STRUCT_MALLINFO_FSMBLKS) CHECK_STRUCT_HAS_MEMBER(hblkhd mallinfo malloc.h HAVE_STRUCT_MALLINFO_HBLKHD) CHECK_STRUCT_HAS_MEMBER(uordblks mallinfo malloc.h HAVE_STRUCT_MALLINFO_UORDBLKS) CHECK_STRUCT_HAS_MEMBER(usmblks mallinfo malloc.h HAVE_STRUCT_MALLINFO_USMBLKS) -CHECK_INCLUDE_FILES(sys/stat.h HAVE_SYS_STAT_H) -CHECK_INCLUDE_FILES(sys/time.h HAVE_SYS_TIME_H) -CHECK_INCLUDE_FILES(sys/types.h HAVE_SYS_TYPES_H) -CHECK_INCLUDE_FILES(unistd.h HAVE_UNISTD_H) # Enable pango defines, necessary for compilation on Win32, how about Linux? # yes but needs to be done a better way if(HAVE_CAIRO_PDF) set(PANGO_ENABLE_ENGINE TRUE) - set(RENDER_WITH_PANGO_CAIRO TRUE) endif() # Relocatable Binary diff --git a/CMakeScripts/ConfigEnv.cmake b/CMakeScripts/ConfigEnv.cmake index 4c537d4a3..4a3300d50 100644 --- a/CMakeScripts/ConfigEnv.cmake +++ b/CMakeScripts/ConfigEnv.cmake @@ -25,10 +25,8 @@ if(WIN32) # These options are required for having i18n support on Windows.
option(ENABLE_NLS "Compile with Native Language Support (using gettext)" ON)
- option(HAVE_BIND_TEXTDOMAIN_CODESET "Compile with 'bind_textdomain_codeset' function" ON)
# Does not compile on Windows with these options.
- option(BR_PTHREADS "Use binreloc thread support" OFF)
option(ENABLE_BINRELOC "Use AutoPackage" OFF)
option(WITH_JEMALLOC "Compile with JEMALLOC support" OFF)
endif()
diff --git a/CMakeScripts/ConfigPaths.cmake b/CMakeScripts/ConfigPaths.cmake index 898d0dfc4..e10625294 100644 --- a/CMakeScripts/ConfigPaths.cmake +++ b/CMakeScripts/ConfigPaths.cmake @@ -6,7 +6,6 @@ if(WIN32) CACHE PATH "Install path prefix, prepended onto install directories." FORCE) endif() - set(INKSCAPE_LIBDIR "\\\\lib") set(INKSCAPE_DATADIR "") # can be set via the environment variable INKSCAPE_DATADIR at runtime set(PACKAGE_LOCALE_DIR "\\\\share\\\\locale") @@ -16,7 +15,6 @@ if(WIN32) mark_as_advanced(SHARE_INSTALL) else() - set(INKSCAPE_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib") set(INKSCAPE_DATADIR "${CMAKE_INSTALL_PREFIX}/share") # TODO: check and change this to correct value: diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 9387926eb..a6b59e26a 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -122,9 +122,6 @@ if(ENABLE_POPPLER) if(POPPLER_CAIRO_FOUND AND POPPLER_GLIB_FOUND) set(HAVE_POPPLER_CAIRO ON) endif() - if(POPPLER_GLIB_FOUND AND CAIRO_SVG_FOUND) - set(HAVE_POPPLER_GLIB ON) - endif() endif() else() set(ENABLE_POPPLER_CAIRO OFF) @@ -141,7 +138,6 @@ add_definitions(${POPPLER_DEFINITIONS}) if(WITH_LIBWPG) find_package(LibWPG) if(LIBWPG_FOUND) - set(WITH_LIBWPG01 ${LIBWPG-0.1_FOUND}) set(WITH_LIBWPG02 ${LIBWPG-0.2_FOUND}) set(WITH_LIBWPG03 ${LIBWPG-0.3_FOUND}) list(APPEND INKSCAPE_INCS_SYS ${LIBWPG_INCLUDE_DIRS}) @@ -155,7 +151,6 @@ endif() if(WITH_LIBVISIO) find_package(LibVisio) if(LIBVISIO_FOUND) - set(WITH_LIBVISIO00 ${LIBVISIO-0.0_FOUND}) set(WITH_LIBVISIO01 ${LIBVISIO-0.1_FOUND}) list(APPEND INKSCAPE_INCS_SYS ${LIBVISIO_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${LIBVISIO_LIBRARIES}) @@ -168,7 +163,6 @@ endif() if(WITH_LIBCDR) find_package(LibCDR) if(LIBCDR_FOUND) - set(WITH_LIBCDR00 ${LIBCDR-0.0_FOUND}) set(WITH_LIBCDR01 ${LIBCDR-0.1_FOUND}) list(APPEND INKSCAPE_INCS_SYS ${LIBCDR_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${LIBCDR_LIBRARIES}) diff --git a/config.h.cmake b/config.h.cmake index a40bba2be..68a11210a 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -6,8 +6,24 @@ #cmakedefine WIN32 #endif -/* Use binreloc thread support? */ -#cmakedefine BR_PTHREADS 1 + + +/* Name of package */ +#define PACKAGE "${PROJECT_NAME}" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "${PROJECT_NAME}" + +/* Translation domain used */ +#define GETTEXT_PACKAGE "${PROJECT_NAME}" + +/* Localization directory */ +#define PACKAGE_LOCALE_DIR "${PACKAGE_LOCALE_DIR}" + + +/* Base data directory -- only path-prefix.h should use it! */ +#define INKSCAPE_DATADIR "${INKSCAPE_DATADIR}" + /* Use AutoPackage? */ #cmakedefine ENABLE_BINRELOC 1 @@ -24,68 +40,25 @@ /* Build with OSX .app data dir paths? */ #cmakedefine ENABLE_OSX_APP_LOCATIONS 1 -/* Translation domain used */ -#define GETTEXT_PACKAGE "${PROJECT_NAME}" - -/* Define to 1 if you have the `bind_textdomain_codeset' function. */ -#cmakedefine HAVE_BIND_TEXTDOMAIN_CODESET 1 - /* Whether the Cairo PDF backend is available */ #cmakedefine HAVE_CAIRO_PDF 1 #cmakedefine PANGO_ENABLE_ENGINE 1 -#cmakedefine RENDER_WITH_PANGO_CAIRO 1 - -/* Define to 1 if you have the <fcntl.h> header file. */ -#cmakedefine HAVE_FCNTL_H 1 -/* Define to 1 if you have the `floor' function. */ -#cmakedefine HAVE_FLOOR 1 - -/* Define to 1 if you have the `fpsetmask' function. */ +/* Define to 1 if you have the `fpsetmask' function. (delete !!!) */ #cmakedefine HAVE_FPSETMASK 1 -/* Define to 1 if you have the `gettimeofday' function. */ -#cmakedefine HAVE_GETTIMEOFDAY 1 - -/* Build with Gtkmm 3.0.x or higher */ -#cmakedefine WITH_GTKMM_3_0 1 - -/* Build with Gtkmm 3.10.x or higher */ -#cmakedefine WITH_GTKMM_3_10 1 - -/* Build with Gtkmm 3.12.x or higher */ -#cmakedefine WITH_GTKMM_3_12 1 - -/* Build with Gtkmm 3.16.x or higher */ -#cmakedefine WITH_GTKMM_3_16 1 - -/* Build with Gtkmm 3.22.x or higher */ -#cmakedefine WITH_GTKMM_3_22 1 - /* Build with GDL 3.6 or higher */ #cmakedefine WITH_GDL_3_6 1 /* Define to 1 if you have the <ieeefp.h> header file. */ #cmakedefine HAVE_IEEEFP_H 1 -/* Define to 1 if you have the <inttypes.h> header file. */ -#cmakedefine HAVE_INTTYPES_H 1 - /* Define to 1 if you have the `mallinfo' function. */ #cmakedefine HAVE_MALLINFO 1 /* Define to 1 if you have the <malloc.h> header file. */ #cmakedefine HAVE_MALLOC_H 1 -/* Define to 1 if you have the `memmove' function. */ -#cmakedefine HAVE_MEMMOVE 1 - -/* Define to 1 if you have the <memory.h> header file. */ -#cmakedefine HAVE_MEMORY_H 1 - -/* Define to 1 if you have the `memset' function. */ -#cmakedefine HAVE_MEMSET 1 - /* Use OpenMP (via cmake) */ #cmakedefine HAVE_OPENMP 1 @@ -98,42 +71,9 @@ /* Use libpoppler-cairo for rendering PDF preview */ #cmakedefine HAVE_POPPLER_CAIRO 1 -/* Use libpoppler-glib and Cairo-SVG for PDF import */ -#cmakedefine HAVE_POPPLER_GLIB 1 - -/* Use color space API from Poppler >= 0.26.0 */ -#cmakedefine POPPLER_EVEN_NEWER_COLOR_SPACE_API 1 - -/* Use color space API from Poppler >= 0.29.0 */ -#cmakedefine POPPLER_EVEN_NEWER_NEW_COLOR_SPACE_API 1 - -/* Use object API from Poppler >= 0.58.0 */ -#cmakedefine POPPLER_NEW_OBJECT_API 1 - -/* Define to 1 if you have the `pow' function. */ -#cmakedefine HAVE_POW 1 - -/* Define to 1 if you have the `sqrt' function. */ -#cmakedefine HAVE_SQRT 1 - /* Define to 1 if you have the <stdint.h> header file. */ #cmakedefine HAVE_STDINT_H 1 -/* Define to 1 if you have the `strpbrk' function. */ -#cmakedefine HAVE_STRPBRK 1 - -/* Define to 1 if you have the `strrchr' function. */ -#cmakedefine HAVE_STRRCHR 1 - -/* Define to 1 if you have the `strspn' function. */ -#cmakedefine HAVE_STRSPN 1 - -/* Define to 1 if you have the `strstr' function. */ -#cmakedefine HAVE_STRSTR 1 - -/* Define to 1 if you have the `strtoul' function. */ -#cmakedefine HAVE_STRTOUL 1 - /* Define to 1 if `fordblks' is member of `struct mallinfo'. */ #cmakedefine HAVE_STRUCT_MALLINFO_FORDBLKS 1 @@ -149,33 +89,6 @@ /* Define to 1 if `usmblks' is member of `struct mallinfo'. */ #cmakedefine HAVE_STRUCT_MALLINFO_USMBLKS 1 -/* Define to 1 if you have the <sys/stat.h> header file. */ -#cmakedefine HAVE_SYS_STAT_H 1 - -/* Define to 1 if you have the <sys/time.h> header file. */ -#cmakedefine HAVE_SYS_TIME_H 1 - -/* Define to 1 if you have the <sys/types.h> header file. */ -#cmakedefine HAVE_SYS_TYPES_H 1 - -/* Define to 1 if you have the <unistd.h> header file. */ -#cmakedefine HAVE_UNISTD_H 1 - -/* Base data directory -- only path-prefix.h should use it! */ -#define INKSCAPE_DATADIR "${INKSCAPE_DATADIR}" - -/* Base library directory -- only path-prefix.h should use it! */ -#define INKSCAPE_LIBDIR "${INKSCAPE_LIBDIR}" - -/* Name of package */ -#define PACKAGE "${PROJECT_NAME}" - -/* Localization directory */ -#define PACKAGE_LOCALE_DIR "${PACKAGE_LOCALE_DIR}" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "${PROJECT_NAME}" - /* Build in dbus */ #cmakedefine WITH_DBUS 1 @@ -191,27 +104,18 @@ /* Build in libcdr */ #cmakedefine WITH_LIBCDR 1 -/* Build using libcdr 0.0.x */ -#cmakedefine WITH_LIBCDR00 1 - /* Build using libcdr 0.1.x */ #cmakedefine WITH_LIBCDR01 1 /* Build in libvisio */ #cmakedefine WITH_LIBVISIO 1 -/* Build using libvisio 0.0.x */ -#cmakedefine WITH_LIBVISIO00 1 - /* Build using libvisio 0.1.x */ #cmakedefine WITH_LIBVISIO01 1 /* Build in libwpg */ #cmakedefine WITH_LIBWPG 1 -/* Build in libwpg-0.1 */ -#cmakedefine WITH_LIBWPG01 1 - /* Build in libwpg-0.2 */ #cmakedefine WITH_LIBWPG02 1 |