]> git.lyx.org Git - features.git/commitdiff
fix compilation on Mac, patch from Stefan.
authorAndré Pönitz <poenitz@gmx.net>
Sat, 6 Oct 2007 16:06:03 +0000 (16:06 +0000)
committerAndré Pönitz <poenitz@gmx.net>
Sat, 6 Oct 2007 16:06:03 +0000 (16:06 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@20788 a592a061-630c-0410-9148-cb99ea01b6c8

development/cmake/src/frontends/qt4/CMakeLists.txt
development/cmake/src/support/CMakeLists.txt

index b9dc1e76ab5e8b90ceec7dd331e6e0074a1b375c..42134960849f5f62a7c07c3ee389a75a39e67746 100644 (file)
@@ -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)
index 51a46d5e7f5a837ed5bdb06502275602940b7884..08cca220e0bf3a7c90d7367fa64b120aa27196a5 100644 (file)
@@ -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})