Attachment 124043 Details for Bug 167488 – lprof-devel-20080514_8.patch

[patch] lprof-devel-20080514_8.patch

lprof-devel-20080514_8.patch (text/plain), 6.83 KB, created by Raphael Kubo da Costa on 2012-05-01 15:20:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Raphael Kubo da Costa

Created: 2012-05-01 15:20:12 UTC

Size: 6.83 KB

patch

obsolete

>Index: files/patch-src-3rdparty-vigra-CMakeLists.txt
>===================================================================
>RCS file: files/patch-src-3rdparty-vigra-CMakeLists.txt
>diff -N files/patch-src-3rdparty-vigra-CMakeLists.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src-3rdparty-vigra-CMakeLists.txt	1 May 2012 14:12:49 -0000
>@@ -0,0 +1,15 @@
>+--- src/3rdparty/vigra/CMakeLists.txt	2008-02-19 18:01:35.000000000 -0300
>++++ src/3rdparty/vigra/CMakeLists.txt	2012-05-01 10:38:31.000000000 -0300
>+@@ -1,6 +1,9 @@
>+-SET_DIRECTORY_PROPERTIES(
>+-        PROPERTIEs
>+-        INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include;${PNG_INCLUDE_DIR};${JPEG_INCLUDE_DIR};${TIFF_INCLUDE_DIR}"
>++INCLUDE_DIRECTORIES(
>++    BEFORE
>++    "${CMAKE_CURRENT_SOURCE_DIR}/include"
>++    "${PNG_INCLUDE_DIR}"
>++    "${JPEG_INCLUDE_DIR}"
>++    "${TIFF_INCLUDE_DIR}"
>+ )
>+ 
>+ SET(IMPEX_SOURCES
>Index: files/patch-src-CMakeLists.txt
>===================================================================
>RCS file: /home/pcvs/ports/graphics/lprof-devel/files/patch-src-CMakeLists.txt,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-src-CMakeLists.txt
>--- files/patch-src-CMakeLists.txt	5 Jun 2008 12:39:13 -0000	1.1
>+++ files/patch-src-CMakeLists.txt	1 May 2012 14:12:49 -0000
>@@ -1,11 +1,32 @@
>---- src/CMakeLists.txt.orig	2008-02-20 00:01:32.000000000 +0300
>-+++ src/CMakeLists.txt	2008-05-24 05:13:22.000000000 +0400
>-@@ -129,7 +129,7 @@
>+--- src/CMakeLists.txt	2008-02-19 18:01:32.000000000 -0300
>++++ src/CMakeLists.txt	2012-05-01 11:00:11.000000000 -0300
>+@@ -129,7 +129,7 @@ ENDFOREACH(lprof_inc_dir)
>  
>  # Normally these are set for us. Since we're overriding the normal include path we've got to add them ourselves, but it's
>  # probably a good idea to be explicit about what we use anyway.
> -SET(lprof_qt_incs "${QT_INCLUDE_DIR};${QT_QT_INCLUDE_DIR};${QT_QTCORE_INCLUDE_DIR};${QT_QTGUI_INCLUDE_DIR};${QT_QTSVG_INCLUDE_DIR};${QT_QT3SUPPORT_INCLUDE_DIR};${QT_QTASSISTANT_INCLUDE_DIR}")
>-+SET(lprof_qt_incs "${QT_QT_INCLUDE_DIR};${QT_QTCORE_INCLUDE_DIR};${QT_QTGUI_INCLUDE_DIR};${QT_QT3SUPPORT_INCLUDE_DIR};${QT_QTASSISTANT_INCLUDE_DIR};${QT_INCLUDE_DIR}")
>++SET(lprof_qt_incs "${QT_QT_INCLUDE_DIR};${QT_QTCORE_INCLUDE_DIR};${QT_QTGUI_INCLUDE_DIR};${QT_QTSVG_INCLUDE_DIR};${QT_QT3SUPPORT_INCLUDE_DIR};${QT_QTASSISTANT_INCLUDE_DIR}")
>  
>  
>  IF(NOT LIBVIGRAIMPEX_FOUND)
>+@@ -143,9 +143,18 @@ ELSE(NOT LIBVIGRAIMPEX_FOUND)
>+     # Static/nonstatic flag should've been added by find script
>+ ENDIF(NOT LIBVIGRAIMPEX_FOUND)
>+ 
>+-SET_DIRECTORY_PROPERTIES(
>+-    PROPERTIES
>+-    INCLUDE_DIRECTORIES "${lprof_inc_dirs};${lprof_qt_incs};${ARGYLL_INCLUDE_DIRS};${impex_include};${LIBUSB_INCLUDE_DIR};${X11_INCLUDE_DIR};${ZLIB_INCLUDE_DIR};${JPEG_INCLUDE_DIR};${TIFF_INCLUDE_DIR};${CMAKE_CURRENT_BINARY_DIR};${WINDDK_INCLUDE_DIR}"
>++INCLUDE_DIRECTORIES(
>++    BEFORE
>++    "${lprof_inc_dirs}"
>++    "${lprof_qt_incs}"
>++    "${ARGYLL_INCLUDE_DIRS}"
>++    "${impex_include}"
>++    "${LIBUSB_INCLUDE_DIR}"
>++    "${X11_INCLUDE_DIR}"
>++    "${ZLIB_INCLUDE_DIR}"
>++    "${JPEG_INCLUDE_DIR}"
>++    "${TIFF_INCLUDE_DIR}"
>++    "${CMAKE_CURRENT_BINARY_DIR}"
>+ )
>+ 
>Index: files/patch-src-ICCtoIT8-CMakeLists.txt
>===================================================================
>RCS file: files/patch-src-ICCtoIT8-CMakeLists.txt
>diff -N files/patch-src-ICCtoIT8-CMakeLists.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src-ICCtoIT8-CMakeLists.txt	1 May 2012 14:12:49 -0000
>@@ -0,0 +1,17 @@
>+--- src/ICCtoIT8/CMakeLists.txt	2008-02-19 18:02:10.000000000 -0300
>++++ src/ICCtoIT8/CMakeLists.txt	2012-05-01 10:37:22.000000000 -0300
>+@@ -7,9 +7,11 @@ ADD_EXECUTABLE(icc2it8
>+     ${ICC2IT8_SOURCES}
>+ )
>+ 
>+-SET_DIRECTORY_PROPERTIES(
>+-    PROPERTIES
>+-    INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/src/lcms/include;${CMAKE_SOURCE_DIR}/src/liblprof;${ARGYLL_INCLUDE_DIRS}"
>++INCLUDE_DIRECTORIES(
>++    BEFORE
>++    "${CMAKE_SOURCE_DIR}/src/lcms/include"
>++    "${CMAKE_SOURCE_DIR}/src/liblprof"
>++    "${ARGYLL_INCLUDE_DIRS}"
>+ )
>+ 
>+ TARGET_LINK_LIBRARIES(icc2it8 liblprof lcmslocal ${COMMON_PLATFORM_LIBS})
>Index: files/patch-src-argyll-CMakeLists.txt
>===================================================================
>RCS file: /home/pcvs/ports/graphics/lprof-devel/files/patch-src-argyll-CMakeLists.txt,v
>retrieving revision 1.1
>diff -u -u -r1.1 patch-src-argyll-CMakeLists.txt
>--- files/patch-src-argyll-CMakeLists.txt	8 Oct 2008 15:00:04 -0000	1.1
>+++ files/patch-src-argyll-CMakeLists.txt	1 May 2012 14:12:49 -0000
>@@ -1,5 +1,20 @@
>---- src/argyll/CMakeLists.txt.orig	2008-09-08 00:27:28.000000000 +0400
>-+++ src/argyll/CMakeLists.txt	2008-09-08 00:27:28.000000000 +0400
>+--- src/argyll/CMakeLists.txt	2008-02-19 18:02:10.000000000 -0300
>++++ src/argyll/CMakeLists.txt	2012-05-01 11:02:19.000000000 -0300
>+@@ -5,9 +5,11 @@ ENDFOREACH(argyll_inc_dir)
>+ 
>+ SET(ARGYLL_INCLUDE_DIRS "${ARGYLL_INCLUDE_DIRS}" CACHE PATH "Argyll cms include directories" FORCE)
>+ 
>+-SET_DIRECTORY_PROPERTIES(
>+-    PROPERTIES
>+-    INCLUDE_DIRECTORIES "${ARGYLL_INCLUDE_DIRS};${LIBUSB_INCLUDE_DIR};${CMAKE_SOURCE_DIR}/src/moncalqt;${WINDDK_INCLUDE_DIR}"
>++INCLUDE_DIRECTORIES(
>++    BEFORE
>++    "${ARGYLL_INCLUDE_DIRS}"
>++    "${LIBUSB_INCLUDE_DIR}"
>++    "${CMAKE_SOURCE_DIR}/src/moncalqt"
>+ )
>+ 
>+ SET(ARGYLL_SOURCES
> @@ -83,3 +83,21 @@
>      PROPERTIES
>      COMPILE_FLAGS "${argyll_flags}"
>Index: files/patch-src-lcms-CMakeLists.txt
>===================================================================
>RCS file: files/patch-src-lcms-CMakeLists.txt
>diff -N files/patch-src-lcms-CMakeLists.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src-lcms-CMakeLists.txt	1 May 2012 14:12:49 -0000
>@@ -0,0 +1,14 @@
>+--- src/lcms/CMakeLists.txt	2008-02-19 18:02:38.000000000 -0300
>++++ src/lcms/CMakeLists.txt	2012-05-01 10:36:07.000000000 -0300
>+@@ -1,8 +1,6 @@
>+-# Note that this will override the basic include path, which we want since there might be a stock
>+-# lcms.h in the OS.
>+-SET_DIRECTORY_PROPERTIES(
>+-    PROPERTIES
>+-    INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include"
>++INCLUDE_DIRECTORIES(
>++    BEFORE
>++    "${CMAKE_CURRENT_SOURCE_DIR}/include"
>+ )
>+ 
>+ SET(LCMSLOCAL_SOURCES
>Index: files/patch-src-liblprof-CMakeLists.txt
>===================================================================
>RCS file: files/patch-src-liblprof-CMakeLists.txt
>diff -N files/patch-src-liblprof-CMakeLists.txt
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ files/patch-src-liblprof-CMakeLists.txt	1 May 2012 14:12:49 -0000
>@@ -0,0 +1,15 @@
>+--- src/liblprof/CMakeLists.txt	2008-02-19 18:02:38.000000000 -0300
>++++ src/liblprof/CMakeLists.txt	2012-05-01 10:35:39.000000000 -0300
>+@@ -18,7 +18,9 @@ ADD_LIBRARY(liblprof
>+     ${LIBLPROF_SOURCES}
>+ )
>+ 
>+-SET_DIRECTORY_PROPERTIES(
>+-    PROPERTIES
>+-    INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/src/lcms/include;${ARGYLL_INCLUDE_DIRS}"
>++INCLUDE_DIRECTORIES(
>++    BEFORE
>++    "${CMAKE_SOURCE_DIR}/src/lcms/include"
>++    "${ARGYLL_INCLUDE_DIRS}"
>+ )
>++

Actions: View | Diff

Attachments on bug 167488: 124043