mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

- Change SET_DIRECTORY_PROPERTIES(INCLUDE_DIRECTORIES) to INCLUDE_DIRECTORIES in cmake scripts to prepare for cmake 2.8.8

Browse Source 
PR:		167488
Submitted by:	Raphael Kubo da Costa <rakuco@FreeBSD.org>
This commit is contained in:
Dmitry Marakasov 2012-05-02 19:31:17 +00:00
parent 15e3ac91e4
commit 03e1ebc4c3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=295881
6 changed files with 103 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
graphics/lprof-devel/files/patch-src-3rdparty-vigra-CMakeLists.txt Normal file
View File

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

29
graphics/lprof-devel/files/patch-src-CMakeLists.txt
View File

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

17
graphics/lprof-devel/files/patch-src-ICCtoIT8-CMakeLists.txt Normal file
View File

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

19
graphics/lprof-devel/files/patch-src-argyll-CMakeLists.txt
View File

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

14
graphics/lprof-devel/files/patch-src-lcms-CMakeLists.txt Normal file
View File

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

15
graphics/lprof-devel/files/patch-src-liblprof-CMakeLists.txt Normal file
View File

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