Attachment #359682 for bug #486288

View | Details | Raw Unified | Return to bug 486288
Collapse All | Expand All




	ELSE(Qt5LinguistTools_FOUND)
		MESSAGE(FATAL_ERROR "ERROR: No Qt5LinguistTools found")
	ENDIF(Qt5LinguistTools_FOUND)

	FIND_PACKAGE(Qt5Designer REQUIRED)
	IF(Qt5Designer_FOUND)
		MESSAGE(STATUS "----- USE Qt5Designer -----")
	ELSE(Qt5Designer_FOUND)
		MESSAGE(FATAL_ERROR "ERROR: No Qt5Designer found")
	ENDIF(Qt5Designer_FOUND)
	FIND_PACKAGE(Qt5PrintSupport REQUIRED)
	IF(Qt5PrintSupport_FOUND)
		MESSAGE(STATUS "----- USE Qt5PrintSupport -----")
	ELSE(Qt5PrintSupport_FOUND)
		MESSAGE(FATAL_ERROR "ERROR: No Qt5PrintSupport found")
	ENDIF(Qt5PrintSupport_FOUND)
	FIND_PACKAGE(Qt5Quick REQUIRED)
	IF(Qt5Quick_FOUND)
		MESSAGE(STATUS "----- USE Qt5Quick -----")
	ELSE(Qt5Quick_FOUND)
		MESSAGE(FATAL_ERROR "ERROR: No Qt5Quick found")
	ENDIF(Qt5Quick_FOUND)



	INCLUDE_DIRECTORIES(${Qt5Core_INCLUDE_DIRS})
	ADD_DEFINITIONS(${Qt5Core_DEFINITIONS})
	INCLUDE_DIRECTORIES(${Qt5Widgets_INCLUDE_DIRS})

	ADD_DEFINITIONS(${Qt5Network_DEFINITIONS})
	INCLUDE_DIRECTORIES(${Qt5OpenGL_INCLUDE_DIRS})
	ADD_DEFINITIONS(${Qt5OpenGL_DEFINITIONS})

	INCLUDE_DIRECTORIES(${Qt5Designer_INCLUDE_DIRS})
	ADD_DEFINITIONS(${Qt5Designer_DEFINITIONS})
	INCLUDE_DIRECTORIES(${Qt5PrintSupport_INCLUDE_DIRS})
	ADD_DEFINITIONS(${Qt5PrintSupport_DEFINITIONS})
	INCLUDE_DIRECTORIES(${Qt5Quick_INCLUDE_DIRS})
	ADD_DEFINITIONS(${Qt5Quick_DEFINITIONS})

#>> Qt

#<< ZLIB, PNG

Lines 1142-1147 Link Here

(-)a/scribus-9999/scribus/CMakeLists.txt (+6 lines)
1142	${Qt5WebKitWidgets_LIBRARIES}	1142	${Qt5WebKitWidgets_LIBRARIES}
1143	${Qt5Network_LIBRARIES}	1143	${Qt5Network_LIBRARIES}
1144	${Qt5OpenGL_LIBRARIES}	1144	${Qt5OpenGL_LIBRARIES}
		1145	${Qt5Designer_LIBRARIES}
		1146	${Qt5PrintSupport_LIBRARIES}
		1147	${Qt5Quick_LIBRARIES}
1145	${CUPS_LIBRARIES}	1148	${CUPS_LIBRARIES}
1146	${FREETYPE_LIBRARIES}	1149	${FREETYPE_LIBRARIES}
1147	${FONTCONFIG_LIBRARIES}	1150	${FONTCONFIG_LIBRARIES}
Lines 1234-1239 Link Here
1234	${Qt5WebKitWidgets_LIBRARIES}	1237	${Qt5WebKitWidgets_LIBRARIES}
1235	${Qt5Network_LIBRARIES}	1238	${Qt5Network_LIBRARIES}
1236	${Qt5OpenGL_LIBRARIES}	1239	${Qt5OpenGL_LIBRARIES}
		1240	${Qt5Designer_LIBRARIES}
		1241	${Qt5PrintSupport_LIBRARIES}
		1242	${Qt5Quick_LIBRARIES}
1237	${LIBXML2_LIBRARIES}	1243	${LIBXML2_LIBRARIES}
1238	${ZLIB_LIBRARIES}	1244	${ZLIB_LIBRARIES}
1239	)	1245	)

Return to bug 486288

Lines 466-471 Link Here

(-)a/scribus-9999/CMakeLists.txt (+30 lines)
466	ELSE(Qt5LinguistTools_FOUND)	466	ELSE(Qt5LinguistTools_FOUND)
467	MESSAGE(FATAL_ERROR "ERROR: No Qt5LinguistTools found")	467	MESSAGE(FATAL_ERROR "ERROR: No Qt5LinguistTools found")
468	ENDIF(Qt5LinguistTools_FOUND)	468	ENDIF(Qt5LinguistTools_FOUND)
		469
		470	FIND_PACKAGE(Qt5Designer REQUIRED)
		471	IF(Qt5Designer_FOUND)
		472	MESSAGE(STATUS "----- USE Qt5Designer -----")
		473	ELSE(Qt5Designer_FOUND)
		474	MESSAGE(FATAL_ERROR "ERROR: No Qt5Designer found")
		475	ENDIF(Qt5Designer_FOUND)
		476	FIND_PACKAGE(Qt5PrintSupport REQUIRED)
		477	IF(Qt5PrintSupport_FOUND)
		478	MESSAGE(STATUS "----- USE Qt5PrintSupport -----")
		479	ELSE(Qt5PrintSupport_FOUND)
		480	MESSAGE(FATAL_ERROR "ERROR: No Qt5PrintSupport found")
		481	ENDIF(Qt5PrintSupport_FOUND)
		482	FIND_PACKAGE(Qt5Quick REQUIRED)
		483	IF(Qt5Quick_FOUND)
		484	MESSAGE(STATUS "----- USE Qt5Quick -----")
		485	ELSE(Qt5Quick_FOUND)
		486	MESSAGE(FATAL_ERROR "ERROR: No Qt5Quick found")
		487	ENDIF(Qt5Quick_FOUND)
		488
		489
		490
469	INCLUDE_DIRECTORIES(${Qt5Core_INCLUDE_DIRS})	491	INCLUDE_DIRECTORIES(${Qt5Core_INCLUDE_DIRS})
470	ADD_DEFINITIONS(${Qt5Core_DEFINITIONS})	492	ADD_DEFINITIONS(${Qt5Core_DEFINITIONS})
471	INCLUDE_DIRECTORIES(${Qt5Widgets_INCLUDE_DIRS})	493	INCLUDE_DIRECTORIES(${Qt5Widgets_INCLUDE_DIRS})
Lines 482-487 Link Here
482	ADD_DEFINITIONS(${Qt5Network_DEFINITIONS})	504	ADD_DEFINITIONS(${Qt5Network_DEFINITIONS})
483	INCLUDE_DIRECTORIES(${Qt5OpenGL_INCLUDE_DIRS})	505	INCLUDE_DIRECTORIES(${Qt5OpenGL_INCLUDE_DIRS})
484	ADD_DEFINITIONS(${Qt5OpenGL_DEFINITIONS})	506	ADD_DEFINITIONS(${Qt5OpenGL_DEFINITIONS})
		507
		508	INCLUDE_DIRECTORIES(${Qt5Designer_INCLUDE_DIRS})
		509	ADD_DEFINITIONS(${Qt5Designer_DEFINITIONS})
		510	INCLUDE_DIRECTORIES(${Qt5PrintSupport_INCLUDE_DIRS})
		511	ADD_DEFINITIONS(${Qt5PrintSupport_DEFINITIONS})
		512	INCLUDE_DIRECTORIES(${Qt5Quick_INCLUDE_DIRS})
		513	ADD_DEFINITIONS(${Qt5Quick_DEFINITIONS})
		514
485	#>> Qt	515	#>> Qt
486		516
487	#<< ZLIB, PNG	517	#<< ZLIB, PNG