Attachment #124043 for bug #167488

View | Details | Raw Unified | Return to bug 167488
Collapse All | Expand All




--- 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




--- 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_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}"
 )
 




--- 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})




--- 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}"




--- 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




--- 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}"
 )
+

Return to bug 167488

Added Link Here

(-)files/patch-src-3rdparty-vigra-CMakeLists.txt (+15 lines)
1	--- src/3rdparty/vigra/CMakeLists.txt 2008-02-19 18:01:35.000000000 -0300
2	+++ src/3rdparty/vigra/CMakeLists.txt 2012-05-01 10:38:31.000000000 -0300
3	@@ -1,6 +1,9 @@
4	-SET_DIRECTORY_PROPERTIES(
5	- PROPERTIEs
6	- INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include;${PNG_INCLUDE_DIR};${JPEG_INCLUDE_DIR};${TIFF_INCLUDE_DIR}"
7	+INCLUDE_DIRECTORIES(
8	+ BEFORE
9	+ "${CMAKE_CURRENT_SOURCE_DIR}/include"
10	+ "${PNG_INCLUDE_DIR}"
11	+ "${JPEG_INCLUDE_DIR}"
12	+ "${TIFF_INCLUDE_DIR}"
13	)
14
15	SET(IMPEX_SOURCES

Lines 1-11 Link Here

(-)files/patch-src-CMakeLists.txt (-4 / +25 lines)
1	--- src/CMakeLists.txt.orig 2008-02-20 00:01:32.000000000 +0300	1	--- src/CMakeLists.txt 2008-02-19 18:01:32.000000000 -0300
2	+++ src/CMakeLists.txt 2008-05-24 05:13:22.000000000 +0400	2	+++ src/CMakeLists.txt 2012-05-01 11:00:11.000000000 -0300
3	@@ -129,7 +129,7 @@	3	@@ -129,7 +129,7 @@ ENDFOREACH(lprof_inc_dir)
4		4
5	# Normally these are set for us. Since we're overriding the normal include path we've got to add them ourselves, but it's	5	# Normally these are set for us. Since we're overriding the normal include path we've got to add them ourselves, but it's
6	# probably a good idea to be explicit about what we use anyway.	6	# probably a good idea to be explicit about what we use anyway.
7	-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}")	7	-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}")
8	+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}")	8	+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}")
9		9
10		10
11	IF(NOT LIBVIGRAIMPEX_FOUND)	11	IF(NOT LIBVIGRAIMPEX_FOUND)
		12	@@ -143,9 +143,18 @@ ELSE(NOT LIBVIGRAIMPEX_FOUND)
		13	# Static/nonstatic flag should've been added by find script
		14	ENDIF(NOT LIBVIGRAIMPEX_FOUND)
		15
		16	-SET_DIRECTORY_PROPERTIES(
		17	- PROPERTIES
		18	- 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}"
		19	+INCLUDE_DIRECTORIES(
		20	+ BEFORE
		21	+ "${lprof_inc_dirs}"
		22	+ "${lprof_qt_incs}"
		23	+ "${ARGYLL_INCLUDE_DIRS}"
		24	+ "${impex_include}"
		25	+ "${LIBUSB_INCLUDE_DIR}"
		26	+ "${X11_INCLUDE_DIR}"
		27	+ "${ZLIB_INCLUDE_DIR}"
		28	+ "${JPEG_INCLUDE_DIR}"
		29	+ "${TIFF_INCLUDE_DIR}"
		30	+ "${CMAKE_CURRENT_BINARY_DIR}"
		31	)
		32

Added Link Here

(-)files/patch-src-ICCtoIT8-CMakeLists.txt (+17 lines)
1	--- src/ICCtoIT8/CMakeLists.txt 2008-02-19 18:02:10.000000000 -0300
2	+++ src/ICCtoIT8/CMakeLists.txt 2012-05-01 10:37:22.000000000 -0300
3	@@ -7,9 +7,11 @@ ADD_EXECUTABLE(icc2it8
4	${ICC2IT8_SOURCES}
5	)
6
7	-SET_DIRECTORY_PROPERTIES(
8	- PROPERTIES
9	- INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/src/lcms/include;${CMAKE_SOURCE_DIR}/src/liblprof;${ARGYLL_INCLUDE_DIRS}"
10	+INCLUDE_DIRECTORIES(
11	+ BEFORE
12	+ "${CMAKE_SOURCE_DIR}/src/lcms/include"
13	+ "${CMAKE_SOURCE_DIR}/src/liblprof"
14	+ "${ARGYLL_INCLUDE_DIRS}"
15	)
16
17	TARGET_LINK_LIBRARIES(icc2it8 liblprof lcmslocal ${COMMON_PLATFORM_LIBS})

Lines 1-5 Link Here

(-)files/patch-src-argyll-CMakeLists.txt (-2 / +17 lines)
1	--- src/argyll/CMakeLists.txt.orig 2008-09-08 00:27:28.000000000 +0400	1	--- src/argyll/CMakeLists.txt 2008-02-19 18:02:10.000000000 -0300
2	+++ src/argyll/CMakeLists.txt 2008-09-08 00:27:28.000000000 +0400	2	+++ src/argyll/CMakeLists.txt 2012-05-01 11:02:19.000000000 -0300
		3	@@ -5,9 +5,11 @@ ENDFOREACH(argyll_inc_dir)
		4
		5	SET(ARGYLL_INCLUDE_DIRS "${ARGYLL_INCLUDE_DIRS}" CACHE PATH "Argyll cms include directories" FORCE)
		6
		7	-SET_DIRECTORY_PROPERTIES(
		8	- PROPERTIES
		9	- INCLUDE_DIRECTORIES "${ARGYLL_INCLUDE_DIRS};${LIBUSB_INCLUDE_DIR};${CMAKE_SOURCE_DIR}/src/moncalqt;${WINDDK_INCLUDE_DIR}"
		10	+INCLUDE_DIRECTORIES(
		11	+ BEFORE
		12	+ "${ARGYLL_INCLUDE_DIRS}"
		13	+ "${LIBUSB_INCLUDE_DIR}"
		14	+ "${CMAKE_SOURCE_DIR}/src/moncalqt"
		15	)
		16
		17	SET(ARGYLL_SOURCES
3	@@ -83,3 +83,21 @@	18	@@ -83,3 +83,21 @@
4	PROPERTIES	19	PROPERTIES
5	COMPILE_FLAGS "${argyll_flags}"	20	COMPILE_FLAGS "${argyll_flags}"

Added Link Here

(-)files/patch-src-lcms-CMakeLists.txt (+14 lines)
1	--- src/lcms/CMakeLists.txt 2008-02-19 18:02:38.000000000 -0300
2	+++ src/lcms/CMakeLists.txt 2012-05-01 10:36:07.000000000 -0300
3	@@ -1,8 +1,6 @@
4	-# Note that this will override the basic include path, which we want since there might be a stock
5	-# lcms.h in the OS.
6	-SET_DIRECTORY_PROPERTIES(
7	- PROPERTIES
8	- INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/include"
9	+INCLUDE_DIRECTORIES(
10	+ BEFORE
11	+ "${CMAKE_CURRENT_SOURCE_DIR}/include"
12	)
13
14	SET(LCMSLOCAL_SOURCES

Added Link Here

(-)files/patch-src-liblprof-CMakeLists.txt (+15 lines)
1	--- src/liblprof/CMakeLists.txt 2008-02-19 18:02:38.000000000 -0300
2	+++ src/liblprof/CMakeLists.txt 2012-05-01 10:35:39.000000000 -0300
3	@@ -18,7 +18,9 @@ ADD_LIBRARY(liblprof
4	${LIBLPROF_SOURCES}
5	)
6
7	-SET_DIRECTORY_PROPERTIES(
8	- PROPERTIES
9	- INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/src/lcms/include;${ARGYLL_INCLUDE_DIRS}"
10	+INCLUDE_DIRECTORIES(
11	+ BEFORE
12	+ "${CMAKE_SOURCE_DIR}/src/lcms/include"
13	+ "${ARGYLL_INCLUDE_DIRS}"
14	)
15	+