diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-07-08 00:47:48 +0000 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-07-08 00:47:48 +0000 |
| commit | b6e16b1d8f843a9524f311d34afd6ea1da22e579 (patch) | |
| tree | 372ac422af8a77399dfb94d204d5c5b52f71b4e6 /CMakeScripts | |
| parent | Fix regression in swatch display (LP #804930). (diff) | |
| download | inkscape-b6e16b1d8f843a9524f311d34afd6ea1da22e579.tar.gz inkscape-b6e16b1d8f843a9524f311d34afd6ea1da22e579.zip | |
fix for building with cmake, renaming the GTK2 package didnt work right, very confusing as to why - I still dont know but calling it the same as CMake's works ok and uses our one.
(bzr r10424)
Diffstat (limited to 'CMakeScripts')
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 2 | ||||
| -rw-r--r-- | CMakeScripts/Modules/FindGTK2.cmake (renamed from CMakeScripts/Modules/FindGTK2_patched.cmake) | 0 | ||||
| -rwxr-xr-x | CMakeScripts/cmake_consistency_check.py | 5 |
3 files changed, 3 insertions, 4 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 96ff53ff9..88c361020 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -46,7 +46,7 @@ add_definitions(${POPT_DEFINITIONS}) # Include dependencies: # use patched version until GTK2_CAIROMMCONFIG_INCLUDE_DIR is added -find_package(GTK2_patched COMPONENTS gtk gtkmm REQUIRED) +find_package(GTK2 COMPONENTS gtk gtkmm REQUIRED) list(APPEND INKSCAPE_INCS_SYS ${GTK2_GDK_INCLUDE_DIR} ${GTK2_GDKMM_INCLUDE_DIR} diff --git a/CMakeScripts/Modules/FindGTK2_patched.cmake b/CMakeScripts/Modules/FindGTK2.cmake index 91249b787..91249b787 100644 --- a/CMakeScripts/Modules/FindGTK2_patched.cmake +++ b/CMakeScripts/Modules/FindGTK2.cmake diff --git a/CMakeScripts/cmake_consistency_check.py b/CMakeScripts/cmake_consistency_check.py index d70a6a7e9..cf0889b74 100755 --- a/CMakeScripts/cmake_consistency_check.py +++ b/CMakeScripts/cmake_consistency_check.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# $Id: cmake_consistency_check.py 36708 2011-05-16 06:11:14Z gsrb3d $ +# $Id: cmake_consistency_check.py 38013 2011-07-01 12:33:34Z campbellbarton $ # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or @@ -26,7 +26,7 @@ from cmake_consistency_check_config import IGNORE, UTF8_CHECK, SOURCE_DIR import os -from os.path import join, dirname, normpath, abspath, splitext +from os.path import join, dirname, normpath, splitext print("Scanning:", SOURCE_DIR) @@ -183,7 +183,6 @@ def is_ignore(f): # First do stupid check, do these files exist? print("\nChecking for missing references:") -import sys is_err = False errs = [] for f in (global_h | global_c): |