=== modified file 'CMakeLists.txt' --- CMakeLists.txt 2014-09-02 23:51:04 +0000 +++ CMakeLists.txt 2014-10-25 09:56:42 +0000 @@ -104,12 +104,6 @@ if(UNIX) # TODO: man, locale, icons - # message after building. - add_custom_command( - TARGET blender POST_BUILD MAIN_DEPENDENCY blender - COMMAND ${CMAKE_COMMAND} -E echo 'now run: \"make install\" to copy runtime files & scripts to ${CMAKE_INSTALL_PREFIX}' - ) - install( PROGRAMS ${EXECUTABLE_OUTPUT_PATH}/inkscape DESTINATION ${CMAKE_INSTALL_PREFIX}/bin === modified file 'CMakeScripts/DefineDependsandFlags.cmake' --- CMakeScripts/DefineDependsandFlags.cmake 2014-04-24 16:06:13 +0000 +++ CMakeScripts/DefineDependsandFlags.cmake 2014-10-25 10:27:33 +0000 @@ -90,6 +90,10 @@ POPPLER_VERSION VERSION_EQUAL "0.12.2") set(POPPLER_NEW_COLOR_SPACE_API ON) endif() + if(POPPLER_VERSION VERSION_GREATER "0.26.0" OR + POPPLER_VERSION VERSION_EQUAL "0.26.0") + set(POPPLER_EVEN_NEWER_COLOR_SPACE_API ON) + endif() if(POPPLER_VERSION VERSION_GREATER "0.15.1" OR POPPLER_VERSION VERSION_EQUAL "0.15.1") set(POPPLER_NEW_GFXPATCH ON) @@ -172,6 +176,7 @@ ${GTK2_CAIROMM_INCLUDE_DIR} ${GTK2_CAIROMMCONFIG_INCLUDE_DIR} # <-- not in cmake 2.8.4 ${GTK2_GIOMM_INCLUDE_DIR} + ${GTK2_GIOMMCONFIG_INCLUDE_DIR} ${GTK2_SIGC++_INCLUDE_DIR} ${GTK2_SIGC++CONFIG_INCLUDE_DIR} ) === modified file 'config.h.cmake' --- config.h.cmake 2014-04-24 18:20:21 +0000 +++ config.h.cmake 2014-10-25 09:56:42 +0000 @@ -137,6 +137,10 @@ /* Use color space API from Poppler >= 0.12.2 */ #cmakedefine POPPLER_NEW_COLOR_SPACE_API 1 +/* Use color space API from Poppler >= 0.26.0 */ +#cmakedefine POPPLER_EVEN_NEWER_COLOR_SPACE_API 1 + + /* GfxPatch no longer uses GfxColor in >= 0.15.1 */ #cmakedefine POPPLER_NEW_GFXPATCH 1 === modified file 'src/CMakeLists.txt' --- src/CMakeLists.txt 2014-10-14 11:01:49 +0000 +++ src/CMakeLists.txt 2014-10-25 09:56:42 +0000 @@ -535,10 +535,19 @@ # make executable for INKSCAPE add_executable(inkscape ${main_SRC} ${inkscape_SRC} ${sp_SRC}) +if(UNIX) +# message after building. +add_custom_command( + TARGET inkscape + POST_BUILD MAIN_DEPENDENCY inkscape + COMMAND ${CMAKE_COMMAND} -E echo 'now run: \"make install\" to copy runtime files & scripts to ${CMAKE_INSTALL_PREFIX}' +) +endif() + add_dependencies(inkscape inkscape_version) target_link_libraries(inkscape - # order from automake + # order from automake #sp_LIB nrtype_LIB