From e5309dd0963845d97f0704c0fc40b0102566bed4 Mon Sep 17 00:00:00 2001 From: taipanromania Date: Fri, 26 Sep 2008 12:11:43 +0000 Subject: [PATCH] better windows support --- frontend/CMakeLists.txt | 4 ++-- frontend_qt4/CMakeLists.txt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/CMakeLists.txt b/frontend/CMakeLists.txt index fa638778..9ca9ad28 100644 --- a/frontend/CMakeLists.txt +++ b/frontend/CMakeLists.txt @@ -4,7 +4,7 @@ project(zint_frontend) set(zint_frontend_SRCS main.c ) -include_directories(BEFORE ../backend) +include_directories(BEFORE "${CMAKE_SOURCE_DIR}/backend") add_executable(zint_frontend ${zint_frontend_SRCS}) @@ -12,6 +12,6 @@ set_target_properties(zint_frontend PROPERTIES OUTPUT_NAME "zint") add_dependencies(zint_frontend zint) -link_directories( "../backend" ) +link_directories( "${CMAKE_BINARY_DIR}/backend" ) target_link_libraries(zint_frontend zint) diff --git a/frontend_qt4/CMakeLists.txt b/frontend_qt4/CMakeLists.txt index eb4b3d7c..871aed4f 100644 --- a/frontend_qt4/CMakeLists.txt +++ b/frontend_qt4/CMakeLists.txt @@ -2,16 +2,16 @@ project(QZint_frontend) -include_directories(BEFORE ../backend ../backend_qt4) +include_directories(BEFORE "${CMAKE_SOURCE_DIR}/backend" "${CMAKE_SOURCE_DIR}/backend_qt4") set(QZint_frontend_SRCS barcodeitem.cpp main.cpp mainwindow.cpp) -QT4_WRAP_CPP(QZint_frontend_SRCS barcodeitem.h mainwindow.h) +QT4_WRAP_CPP(QZint_frontend_SRCS mainwindow.h) QT4_WRAP_UI(QZint_frontend_SRCS mainWindow.ui) add_executable(QZint_frontend ${QZint_frontend_SRCS}) add_dependencies(QZint_frontend QZint zint) -link_directories( "../backend" "../backend_qt4" ) +link_directories( "${CMAKE_BINARY_DIR}/backend" "${CMAKE_BINARY_DIR}/backend_qt4" ) target_link_libraries(QZint_frontend zint QZint ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} )