Updated Makefile.am

Travis CI cannot find "qucspowercombiningtool.h" header, so this commit is another attempt to solve the problem
Qucs · Aug 31, 2016 · fa7f5d9 · fa7f5d9
1 parent 1080791
commit fa7f5d9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/qucs/qucs-wideband-matching/CMakeLists.txt b/qucs/qucs-wideband-matching/CMakeLists.txt
@@ -2,6 +2,8 @@ PROJECT(QucsWidebandMatching CXX C)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 cmake_policy(VERSION 2.6)
 
+FIND_PACKAGE(Qt4 COMPONENTS QtSvg QtGui QtCore)
+INCLUDE(${QT_USE_FILE})
 # use top VERSION file
 file (STRINGS ${PROJECT_SOURCE_DIR}/../VERSION QUCS_VERSION)
 message(STATUS "Configuring ${PROJECT_NAME} (GUI): VERSION ${QUCS_VERSION}")
@@ -79,7 +81,7 @@ IF(APPLE)
 ENDIF(APPLE)
 
 ADD_EXECUTABLE( QucsWidebandMatching MACOSX_BUNDLE WIN32
-  ${wb_matching_sources}
+  ${}
   ${wb_matching_moc_sources}
   ${RESOURCES_SRCS} )
 

diff --git a/qucs/qucs-wideband-matching/Makefile.am b/qucs/qucs-wideband-matching/Makefile.am
@@ -29,6 +29,8 @@ MOCFILES = $(MOCHEADERS:.h=.moc.cpp)
 
 QucsWidebandMatching_SOURCES = main.cpp ui.cpp io.cpp MathOperations.cpp mat.cpp sparengine.cpp GRABIM.cpp qrc_QucsWidebandMatching.cpp
 
+EXTRA_DIST = QucsWidebandMatching.qrc
+
 qrc_QucsWidebandMatching.cpp: QucsWidebandMatching.qrc
 	$(RCC) -o $@ $<
 
@@ -39,6 +41,8 @@ AM_CPPFLAGS = $(X11_INCLUDES) $(QT_INCLUDES)
 QucsWidebandMatching_LDFLAGS = $(X11_LDFLAGS) $(QT_LDFLAGS)
 QucsWidebandMatching_LDADD = $(X11_LIBS) $(QT_LIBS)
 
+noinst_HEADERS = $(MOCHEADERS)
+
 SUFFIXES = .moc.cpp
 
 .h.moc.cpp: