Permalink
Browse files

Fix build with qmake and cmake

  • Loading branch information...
1 parent 4e8f7b6 commit 549aff035e57b3f2899b8876feb3102202902248 @hluk committed Mar 16, 2013
Showing with 22 additions and 5 deletions.
  1. +13 −3 plugins/CMakeLists.txt
  2. +7 −0 plugins/itemimage/CMakeLists.txt
  3. +2 −2 plugins/itemimage/itemimage.pro
View
16 plugins/CMakeLists.txt
@@ -1,9 +1,19 @@
macro (copyq_add_plugin)
set(copyq_pkg ${ARGV0})
- file(GLOB copyq_plugin_${copyq_pkg}_SOURCES *.cpp ../../src/itemwidget.cpp)
- file(GLOB copyq_plugin_${copyq_pkg}_MOCABLE *.h)
- file(GLOB copyq_plugin_${copyq_pkg}_FORMS *.ui)
+ file(GLOB copyq_plugin_${copyq_pkg}_SOURCES
+ ${copyq_plugin_${copyq_pkg}_SOURCES}
+ *.cpp
+ ../../src/itemwidget.cpp
+ )
+ file(GLOB copyq_plugin_${copyq_pkg}_MOCABLE
+ ${copyq_plugin_${copyq_pkg}_MOCABLE}
+ *.h
+ )
+ file(GLOB copyq_plugin_${copyq_pkg}_FORMS
+ ${copyq_plugin_${copyq_pkg}_FORMS}
+ *.ui
+ )
include_directories(${CMAKE_CURRENT_BINARY_DIR} ../../src/include)
View
7 plugins/itemimage/CMakeLists.txt
@@ -1,2 +1,9 @@
+set(copyq_plugin_itemimage_SOURCES
+ ../../src/itemeditor.cpp
+ )
+set(copyq_plugin_itemimage_MOCABLE
+ ../../src/include/itemeditor.h
+ )
+
copyq_add_plugin(itemimage)
View
4 plugins/itemimage/itemimage.pro
@@ -5,6 +5,6 @@ SOURCES += itemimage.cpp
FORMS += itemimagesettings.ui
TARGET = $$qtLibraryTarget(itemimage)
-HEADERS += ../../../src/include/itemeditor.h
-SOURCES += ../../../src/itemeditor.cpp
+HEADERS += ../../src/include/itemeditor.h
+SOURCES += ../../src/itemeditor.cpp

0 comments on commit 549aff0

Please sign in to comment.