Attachment #337932 for bug #455498

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

Lines 4-9 Link Here

(-)tora-2.1.4~/CMakeLists.txt (+6 lines)
4	# options available for user's input	4	# options available for user's input
5	OPTION(WANT_DEBUG "Set the debug build and possible additional outputs" OFF)	5	OPTION(WANT_DEBUG "Set the debug build and possible additional outputs" OFF)
6	OPTION(WANT_INTERNAL_QSCINTILLA "Use internal/bundled QScintilla2 source" OFF)	6	OPTION(WANT_INTERNAL_QSCINTILLA "Use internal/bundled QScintilla2 source" OFF)
		7	OPTION(WANT_INTERNAL_LOKI "Use internal/bundled Loki source" OFF)
7	OPTION(ENABLE_ORACLE "Enable/Disable Oracle support at all. Including detection" ON)	8	OPTION(ENABLE_ORACLE "Enable/Disable Oracle support at all. Including detection" ON)
8	OPTION(ENABLE_PGSQL "Enable/Disable PostgreSQL support. Including detection" ON)	9	OPTION(ENABLE_PGSQL "Enable/Disable PostgreSQL support. Including detection" ON)
9	OPTION(ENABLE_DB2 "Enable/Disable DB2 support. Including detection" ON)	10	OPTION(ENABLE_DB2 "Enable/Disable DB2 support. Including detection" ON)
Lines 54-59 Link Here
54	INCLUDE(CheckTypeSize)	55	INCLUDE(CheckTypeSize)
55	INCLUDE(TestBigEndian)	56	INCLUDE(TestBigEndian)
56	INCLUDE(FindSubversion)	57	INCLUDE(FindSubversion)
		58	INCLUDE(FindPkgConfig)
57		59
58		60
59	#Set the custom CMake module directory where our include/lib finders are	61	#Set the custom CMake module directory where our include/lib finders are
Lines 222-227 Link Here
222	MESSAGE(FATAL_ERROR "No Qt4 found")	224	MESSAGE(FATAL_ERROR "No Qt4 found")
223	ENDIF(QT_FOUND)	225	ENDIF(QT_FOUND)
224		226
		227	IF (WANT_INTERNAL_LOKI)
		228	ELSE (WANT_INTERNAL_LOKI)
		229	pkg_check_modules(LOKI REQUIRED ferrisloki)
		230	ENDIF (WANT_INTERNAL_LOKI)
225		231
226	IF (WANT_INTERNAL_QSCINTILLA)	232	IF (WANT_INTERNAL_QSCINTILLA)
227	MESSAGE(STATUS "QSci: Building with internal copy of QScintilla.")	233	MESSAGE(STATUS "QSci: Building with internal copy of QScintilla.")

Lines 3-9 Link Here

(-)tora-2.1.4~/src/CMakeLists.txt (-5 / +13 lines)
3		3
4	#Subdirectories	4	#Subdirectories
5	# ADD_SUBDIRECTORY(i18n)	5	# ADD_SUBDIRECTORY(i18n)
6	ADD_SUBDIRECTORY(loki)	6	# Default: loki as 3rd party lib!
		7	IF (WANT_INTERNAL_LOKI)
		8	ADD_SUBDIRECTORY(loki)
		9	ENDIF(WANT_INTERNAL_LOKI)
7	IF (WIN32)	10	IF (WIN32)
8	ADD_SUBDIRECTORY(windows)	11	ADD_SUBDIRECTORY(windows)
9	ENDIF (WIN32)	12	ENDIF (WIN32)
Lines 497-503 Link Here
497	QT4_ADD_RESOURCES(TORA_RCC_SRCS ${TORA_RCC_FILES})	500	QT4_ADD_RESOURCES(TORA_RCC_SRCS ${TORA_RCC_FILES})
498		501
499		502
500	LINK_DIRECTORIES(./loki)	503	IF (WANT_INTERNAL_LOKI)
		504	LINK_DIRECTORIES(./loki)
		505	ENDIF(WANT_INTERNAL_LOKI)
501	IF (WIN32)	506	IF (WIN32)
502	LINK_DIRECTORIES(./windows)	507	LINK_DIRECTORIES(./windows)
503	ENDIF (WIN32)	508	ENDIF (WIN32)
Lines 506-512 Link Here
506	ENDIF (WANT_INTERNAL_QSCINTILLA)	511	ENDIF (WANT_INTERNAL_QSCINTILLA)
507		512
508		513
509	SET(TORA_LOKI_LIB "tora_loki_lib")	514	IF (WANT_INTERNAL_LOKI)
		515	SET(LOKI_LIBRARIES "tora_loki_lib")
		516	SET(LOKI_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/loki/include)
		517	ENDIF(WANT_INTERNAL_LOKI)
510	IF (WANT_INTERNAL_QSCINTILLA)	518	IF (WANT_INTERNAL_QSCINTILLA)
511	SET (TORA_QSCINTILLA_LIB tora_qscintilla2_lib)	519	SET (TORA_QSCINTILLA_LIB tora_qscintilla2_lib)
512	ENDIF (WANT_INTERNAL_QSCINTILLA)	520	ENDIF (WANT_INTERNAL_QSCINTILLA)
Lines 522-528 Link Here
522	${CMAKE_CURRENT_SOURCE_DIR}	530	${CMAKE_CURRENT_SOURCE_DIR}
523	${CMAKE_BINARY_DIR}	531	${CMAKE_BINARY_DIR}
524	${QT_INCLUDES}	532	${QT_INCLUDES}
525	${CMAKE_CURRENT_SOURCE_DIR}/loki/include	533	${LOKI_INCLUDE_DIRS}
526	${CMAKE_CURRENT_SOURCE_DIR}/otl	534	${CMAKE_CURRENT_SOURCE_DIR}/otl
527	)	535	)
528		536
Lines 648-654 Link Here
648	ENDIF(USE_EXPERIMENTAL)	656	ENDIF(USE_EXPERIMENTAL)
649		657
650	# static	658	# static
651	TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_LOKI_LIB})	659	TARGET_LINK_LIBRARIES(${EXE_NAME} ${LOKI_LIBRARIES})
652	IF (WANT_INTERNAL_QSCINTILLA)	660	IF (WANT_INTERNAL_QSCINTILLA)
653	TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_QSCINTILLA_LIB} ${QT_LIBRARIES})	661	TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_QSCINTILLA_LIB} ${QT_LIBRARIES})
654	ENDIF (WANT_INTERNAL_QSCINTILLA)	662	ENDIF (WANT_INTERNAL_QSCINTILLA)

Return to bug 455498