From: André Pönitz Date: Sat, 6 Oct 2007 16:06:03 +0000 (+0000) Subject: fix compilation on Mac, patch from Stefan. X-Git-Tag: 1.6.10~7983 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4ad8feb462be878cbcc3e0dad19a0b132a060141;p=lyx.git fix compilation on Mac, patch from Stefan. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20788 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/development/cmake/src/frontends/qt4/CMakeLists.txt b/development/cmake/src/frontends/qt4/CMakeLists.txt index b9dc1e76ab..4213496084 100644 --- a/development/cmake/src/frontends/qt4/CMakeLists.txt +++ b/development/cmake/src/frontends/qt4/CMakeLists.txt @@ -24,7 +24,7 @@ add_definitions(-DQT_GENUINE_STR -DLYX_BUILD_QT4_FRONTEND) include_directories( ${TOP_SRC_DIR}/src/frontends/qt4 ${TOP_SRC_DIR}/src/frontends/controllers - ${QT_INCLUDE_DIR} ${QT_INCLUDE_DIR}/QtCore ${QT_INCLUDE_DIR}/QtGui + ${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) if(MERGE_FILES) diff --git a/development/cmake/src/support/CMakeLists.txt b/development/cmake/src/support/CMakeLists.txt index 51a46d5e7f..08cca220e0 100644 --- a/development/cmake/src/support/CMakeLists.txt +++ b/development/cmake/src/support/CMakeLists.txt @@ -27,7 +27,7 @@ lyx_add_msvc_pch(support) include_directories(${TOP_SRC_DIR}/src/support ${TOP_SRC_DIR}/src/support/minizip - ${QT_INCLUDE_DIR} ${QT_INCLUDE_DIR}/QtCore + ${QT_INCLUDES} ${ICONV_INCLUDE_DIR})