diff options
| author | Robert Jonsson <spamatica@gmail.com> | 2006-05-15 21:04:35 +0000 |
|---|---|---|
| committer | Robert Jonsson <spamatica@gmail.com> | 2006-05-15 21:04:35 +0000 |
| commit | c605c2a6086600fcd890c364af29fb4b0e5757b9 (patch) | |
| tree | b18a5420b06feba61c5b4d7853f4f7aa5cbc16ed | |
| parent | 5290d9fb5e4daff97583e1e1e86ffbb342809d38 (diff) | |
Fixed hardcoded refs to qt in CMakeLists.txt
| -rw-r--r-- | muse/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | muse/ChangeLog | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/muse/CMakeLists.txt b/muse/CMakeLists.txt index e1eda9a6..1ea31fd2 100644 --- a/muse/CMakeLists.txt +++ b/muse/CMakeLists.txt @@ -157,9 +157,9 @@ add_custom_target(all.h.pch ALL ${CMAKE_CXX_COMPILER} -g -Wextra -fno-exceptions -fno-rtti -Wall - -I/usr/qt4/include - -I/usr/qt4/include/QtCore - -I/usr/qt4/include/QtGui + -I${QT_INCLUDE_DIR} + -I${QT_QTCORE_INCLUDE_DIR} + -I${QT_QTGUI_INCLUDE_DIR} -o ${PROJECT_BINARY_DIR}/all.h.pch ${PROJECT_SOURCE_DIR}/all.h DEPENDS ${PROJECT_SOURCE_DIR}/all.h @@ -171,9 +171,9 @@ add_custom_target(all-pic.h.pch ${CMAKE_CXX_COMPILER} -fPIC -g -Wextra -fno-exceptions -fno-rtti -Wall - -I/usr/qt4/include - -I/usr/qt4/include/QtCore - -I/usr/qt4/include/QtGui + -I${QT_INCLUDE_DIR} + -I${QT_QTCORE_INCLUDE_DIR} + -I${QT_QTGUI_INCLUDE_DIR} -o ${PROJECT_BINARY_DIR}/all-pic.h.pch ${PROJECT_BINARY_DIR}/all-pic.h DEPENDS ${PROJECT_BINARY_DIR}/all-pic.h diff --git a/muse/ChangeLog b/muse/ChangeLog index 33b4639a..1031a547 100644 --- a/muse/ChangeLog +++ b/muse/ChangeLog @@ -1,3 +1,5 @@ +15.5 (rj) + * Fixed hardcoded refs to qt in CMakeLists.txt 11.5 (ws) * implemented new project handling; first docs in doc/man/de 3.5 (ws) |