diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-27 17:44:58 +0000 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-27 17:44:58 +0000 |
| commit | 41a60d0f4d77fbde96f6e8196af58718995da78f (patch) | |
| tree | 1b404a1f6419f0aef627f961a7be2c44e651dace | |
| parent | remove stray comma causing build warnings. (diff) | |
| download | inkscape-41a60d0f4d77fbde96f6e8196af58718995da78f.tar.gz inkscape-41a60d0f4d77fbde96f6e8196af58718995da78f.zip | |
fix for building when WITH_LIBWPG couldn't be found.
(bzr r10651)
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 3 | ||||
| -rw-r--r-- | src/extension/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index cf1f59996..fff82a174 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -85,8 +85,9 @@ if(WITH_LIBWPG) list(APPEND INKSCAPE_INCS_SYS ${LIBWPG_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${LIBWPG_LIBRARIES}) add_definitions(${LIBWPG_DEFINITIONS}) + else() + set(WITH_LIBWPG OFF) endif() - set(WITH_LIBWPG ${LIBWPG_FOUND}) endif() find_package(PNG REQUIRED) diff --git a/src/extension/CMakeLists.txt b/src/extension/CMakeLists.txt index bf4bf6a89..ba1b084af 100644 --- a/src/extension/CMakeLists.txt +++ b/src/extension/CMakeLists.txt @@ -151,7 +151,7 @@ if(WIN32) ) endif() -if(LIBWPG_FOUND) +if(WITH_LIBWPG) list(APPEND extension_SRC internal/wpg-input.cpp internal/wpg-input.h |