mirror of
https://git.freebsd.org/ports.git
synced 2025-07-07 20:39:18 -04:00
32 lines
1.5 KiB
Text
32 lines
1.5 KiB
Text
--- 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}
|
|
)
|
|
|