Updated Makefile.am

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

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/qucs/qucs-powercombining/CMakeLists.txt b/qucs/qucs-powercombining/CMakeLists.txt
@@ -1,7 +1,8 @@
 PROJECT(qucspowercombining 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}")

diff --git a/qucs/qucs-powercombining/Makefile.am b/qucs/qucs-powercombining/Makefile.am
@@ -28,6 +28,7 @@ MOCFILES = $(MOCHEADERS:.h=.moc.cpp)
 
 qucspowercombining_SOURCES = main.cpp qucspowercombiningtool.cpp qrc_qucspowercombining.cpp
 
+EXTRA_DIST = qucspowercombining.qrc
 qrc_qucspowercombining.cpp: qucspowercombining.qrc
 	$(RCC) -o $@ $<
 
@@ -37,6 +38,8 @@ AM_CPPFLAGS = $(X11_INCLUDES) $(QT_INCLUDES)
 qucspowercombining_LDFLAGS = $(X11_LDFLAGS) $(QT_LDFLAGS)
 qucspowercombining_LDADD = $(X11_LIBS) $(QT_LIBS)
 
+noinst_HEADERS = $(MOCHEADERS)
+
 SUFFIXES = .moc.cpp
 
 .h.moc.cpp: