=== modified file 'CMakeScripts/DefineDependsandFlags.cmake' --- CMakeScripts/DefineDependsandFlags.cmake 2013-11-16 20:50:28 +0000 +++ CMakeScripts/DefineDependsandFlags.cmake 2013-11-18 19:09:10 +0000 @@ -39,9 +39,11 @@ #list(APPEND INKSCAPE_LIBS "-lgslcblas") # FIXME -pkg_check_modules(X11 REQUIRED x11) -list(APPEND INKSCAPE_INCS_SYS ${X11_INCLUDE_DIRS}) -list(APPEND INKSCAPE_LIBS ${X11_LIBRARIES}) +if (NOT WIN32) + pkg_check_modules(X11 REQUIRED x11) + list(APPEND INKSCAPE_INCS_SYS ${X11_INCLUDE_DIRS}) + list(APPEND INKSCAPE_LIBS ${X11_LIBRARIES}) +endif() if(WITH_GNOME_VFS) #find_package(GnomeVFS2) @@ -67,7 +69,7 @@ endif() #find_package(BoehmGC REQUIRED) -pkg_check_modules(BOEHMGC REQUIRED bdw-gc>=7.1) +pkg_check_modules(BOEHMGC REQUIRED bdw-gc>=7.0) list(APPEND INKSCAPE_INCS_SYS ${BOEHMGC_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${BOEHMGC_LIBRARIES}) add_definitions(${BOEHMGC_DEFINITIONS}) @@ -216,6 +218,7 @@ set(HAVE_ASPELL TRUE) endif() +if (NOT WIN32) if(WITH_GTKSPELL) #find_package(GtkSpell) pkg_check_modules(GTKSPELL gtkspell-2.0) @@ -226,13 +229,20 @@ endif() set(WITH_GTKSPELL ${GTKSPELL_FOUND}) endif() +endif() #find_package(OpenSSL) #list(APPEND INKSCAPE_INCS_SYS ${OPENSSL_INCLUDE_DIR}) #list(APPEND INKSCAPE_LIBS ${OPENSSL_LIBRARIES}) -find_package(LibXslt 1.0.15 REQUIRED) -list(APPEND INKSCAPE_INCS_SYS ${LIBXSLT_INCLUDE_DIR}) + +if (WIN32) + pkg_check_modules(LIBXSLT REQUIRED libxslt>=1.0.15) + list(APPEND INKSCAPE_INCS_SYS ${BOEHMGC_INCLUDE_DIRS}) +else() + find_package(LibXslt 1.0.15 REQUIRED) + list(APPEND INKSCAPE_INCS_SYS ${LIBXSLT_INCLUDE_DIR}) +endif() list(APPEND INKSCAPE_LIBS ${LIBXSLT_LIBRARIES}) add_definitions(${LIBXSLT_DEFINITIONS})