diff -Naur tora-2.1.1.orig/CMakeLists.txt tora-2.1.1/CMakeLists.txt --- tora-2.1.1.orig/CMakeLists.txt 2014-09-30 12:39:59.000000000 +0400 +++ tora-2.1.1/CMakeLists.txt 2014-09-30 12:45:12.000000000 +0400 @@ -4,6 +4,7 @@ # options available for user's input OPTION(WANT_DEBUG "Set the debug build and possible additional outputs" OFF) OPTION(WANT_INTERNAL_QSCINTILLA "Use internal/bundled QScintilla2 source" OFF) +OPTION(WANT_INTERNAL_LOKI "Use internal/bundled Loki source" OFF) OPTION(ENABLE_ORACLE "Disable Oracle support at all. Including detection" ON) OPTION(ENABLE_PGSQL "Disable PostgreSQL support. Including detection" ON) OPTION(WANT_RPM "Enable additional RPM related stuff. Additional make package_rpm target" ON) @@ -37,6 +38,7 @@ INCLUDE(CheckCXXCompilerFlag) INCLUDE(CheckTypeSize) INCLUDE(TestBigEndian) +INCLUDE(FindPkgConfig) #Set the custom CMake module directory where our include/lib finders are SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules") @@ -172,6 +174,10 @@ MESSAGE(FATAL_ERROR "No Qt4 found") ENDIF(QT_FOUND) +IF (WANT_INTERNAL_LOKI) +ELSE (WANT_INTERNAL_LOKI) + pkg_check_modules(LOKI REQUIRED ferrisloki) +ENDIF (WANT_INTERNAL_LOKI) IF (WANT_INTERNAL_QSCINTILLA) MESSAGE(STATUS "QSci: Building with internal copy of QScintilla.") diff -Naur tora-2.1.1.orig/src/CMakeLists.txt tora-2.1.1/src/CMakeLists.txt --- tora-2.1.1.orig/src/CMakeLists.txt 2014-09-30 12:39:59.000000000 +0400 +++ tora-2.1.1/src/CMakeLists.txt 2014-09-30 12:47:59.000000000 +0400 @@ -2,7 +2,10 @@ #Subdirectories # ADD_SUBDIRECTORY(i18n) -ADD_SUBDIRECTORY(loki) +# Default: loki as 3rd party lib! +IF (WANT_INTERNAL_LOKI) + ADD_SUBDIRECTORY(loki) +ENDIF(WANT_INTERNAL_LOKI) IF (WIN32) ADD_SUBDIRECTORY(windows) ENDIF (WIN32) @@ -433,7 +436,9 @@ QT4_ADD_RESOURCES(TORA_RCC_SRCS ${TORA_RCC_FILES}) -LINK_DIRECTORIES(./loki) +IF (WANT_INTERNAL_LOKI) + LINK_DIRECTORIES(./loki) +ENDIF(WANT_INTERNAL_LOKI) IF (WIN32) LINK_DIRECTORIES(./windows) ENDIF (WIN32) @@ -442,7 +447,10 @@ ENDIF (WANT_INTERNAL_QSCINTILLA) -SET(TORA_LOKI_LIB "tora_loki_lib") +IF (WANT_INTERNAL_LOKI) + SET(LOKI_LIBRARIES "tora_loki_lib") + SET(LOKI_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/loki/include) +ENDIF(WANT_INTERNAL_LOKI) IF (WANT_INTERNAL_QSCINTILLA) SET (TORA_QSCINTILLA_LIB tora_qscintilla2_lib) ENDIF (WANT_INTERNAL_QSCINTILLA) @@ -458,7 +466,7 @@ ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${QT_INCLUDES} - ${CMAKE_CURRENT_SOURCE_DIR}/loki/include + ${LOKI_INCLUDE_DIRS} ${CMAKE_CURRENT_SOURCE_DIR}/otl ) @@ -529,7 +537,7 @@ ENDIF (POSTGRESQL_LIBRARIES) # static -TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_LOKI_LIB}) +TARGET_LINK_LIBRARIES(${EXE_NAME} ${LOKI_LIBRARIES}) IF (WANT_INTERNAL_QSCINTILLA) TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_QSCINTILLA_LIB} ${QT_LIBRARIES}) ENDIF (WANT_INTERNAL_QSCINTILLA)