summaryrefslogtreecommitdiffstats
path: root/CMakeScripts
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2015-05-03 20:30:56 +0000
committer~suv <suv-sf@users.sourceforge.net>2015-05-03 20:30:56 +0000
commitfe043be9888e82f4d199099629824d7e62da3dfa (patch)
tree02425065c2eaa294326fa8f269bdc8132d48f5b9 /CMakeScripts
parentcmake: use cmake modules for iconv and inlt (diff)
downloadinkscape-fe043be9888e82f4d199099629824d7e62da3dfa.tar.gz
inkscape-fe043be9888e82f4d199099629824d7e62da3dfa.zip
cmake: move Intl check to 'Files we include' section
Because the FindIntl module was only recently added to Cmake, I added a copy to Inkscape's Modules dir in r14098 but forgot to properly reflect this in CMakeScripts/DefineDependsandFlags.cmake. (bzr r14099)
Diffstat (limited to 'CMakeScripts')
-rw-r--r--CMakeScripts/DefineDependsandFlags.cmake10
1 files changed, 5 insertions, 5 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 71bb042bc..f7c371bae 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -87,6 +87,11 @@ list(APPEND INKSCAPE_INCS_SYS ${ICONV_INCLUDE_DIRS})
list(APPEND INKSCAPE_LIBS ${ICONV_LIBRARIES})
add_definitions(${ICONV_DEFINITIONS})
+find_package(Intl REQUIRED)
+list(APPEND INKSCAPE_INCS_SYS ${Intl_INCLUDE_DIRS})
+list(APPEND INKSCAPE_LIBS ${Intl_LIBRARIES})
+add_definitions(${Intl_DEFINITIONS})
+
find_package(BoehmGC REQUIRED)
list(APPEND INKSCAPE_INCS_SYS ${BOEHMGC_INCLUDE_DIRS})
list(APPEND INKSCAPE_LIBS ${BOEHMGC_LIBRARIES})
@@ -262,11 +267,6 @@ list(APPEND INKSCAPE_LIBS
)
-find_package(Intl REQUIRED)
-list(APPEND INKSCAPE_INCS_SYS ${Intl_INCLUDE_DIRS})
-list(APPEND INKSCAPE_LIBS ${Intl_LIBRARIES})
-add_definitions(${Intl_DEFINITIONS})
-
find_package(Freetype REQUIRED)
list(APPEND INKSCAPE_INCS_SYS ${FREETYPE_INCLUDE_DIRS})
list(APPEND INKSCAPE_LIBS ${FREETYPE_LIBRARIES})