diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2012-05-02 19:31:17 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2012-05-02 19:31:17 +0000 |
| commit | 03e1ebc4c3165b408c44a4df2b68aeb6c0f591f9 (patch) | |
| tree | c6bcaadddecf1079ae4ebe18b9105d118cd80e9a /graphics/lprof-devel/files/patch-src-CMakeLists.txt | |
| parent | - Update to 1.10 (diff) | |
- Change SET_DIRECTORY_PROPERTIES(INCLUDE_DIRECTORIES) to INCLUDE_DIRECTORIES in cmake scripts to prepare for cmake 2.8.8
PR: 167488
Submitted by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
Diffstat (limited to 'graphics/lprof-devel/files/patch-src-CMakeLists.txt')
| -rw-r--r-- | graphics/lprof-devel/files/patch-src-CMakeLists.txt | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/graphics/lprof-devel/files/patch-src-CMakeLists.txt b/graphics/lprof-devel/files/patch-src-CMakeLists.txt index f564ba957e14..7cbccbd27908 100644 --- a/graphics/lprof-devel/files/patch-src-CMakeLists.txt +++ b/graphics/lprof-devel/files/patch-src-CMakeLists.txt @@ -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} + ) + |