Merge pull request #1 from ra3xdh/PwrCombiningFix

Various fixes on PowerCombining Tool build system
andresmmera · Sep 2, 2015 · a53e66e · a53e66e
2 parents 45c0959 + 4a2d98b
commit a53e66e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 533 deletions.
diff --git a/qucs/qucs-powercombining/CMakeLists.txt b/qucs/qucs-powercombining/CMakeLists.txt
@@ -54,8 +54,12 @@ SET( powercombining_sources main.cpp powercombiningwindow.cpp  )
 
 SET( powercombining_moc_headers powercombiningwindow.h )
 
+SET( powercombining_ui powercombiningwindow.ui )
+
 QT4_WRAP_CPP( powercombining_moc_sources ${powercombining_moc_headers} )
 
+QT4_WRAP_UI( powercombining_uic_hdrs ${powercombining_ui} )
+
 #SET(RESOURCES qucspowercombining.qrc)
 
 QT4_ADD_RESOURCES(RESOURCES_SRCS ${RESOURCES})
@@ -81,6 +85,7 @@ ENDIF(APPLE)
 ADD_EXECUTABLE( qucspowercombining MACOSX_BUNDLE WIN32
   ${powercombining_sources}
   ${powercombining_moc_sources}
+  ${powercombining_uic_hdrs}
   ${RESOURCES_SRCS} )
 
 TARGET_LINK_LIBRARIES( qucspowercombining ${QT_LIBRARIES} )

diff --git a/qucs/qucs-powercombining/powercombiningwindow.cpp b/qucs/qucs-powercombining/powercombiningwindow.cpp
@@ -1,7 +1,7 @@
 #include "powercombiningwindow.h"
 #include "ui_powercombiningwindow.h"
-#include<./../qucs/qucs.h>
-#include<./../qucs/misc.h>
+#include "../qucs/qucs.h"
+#include "../qucs/misc.h"
 #include "../qucs-filter/material_props.h"
 /*#include "../qucs/main.h" <= It should be included to use pi, but it crashes
 */