Lines 2-8
Link Here
|
2 |
|
2 |
|
3 |
#Subdirectories |
3 |
#Subdirectories |
4 |
# ADD_SUBDIRECTORY(i18n) |
4 |
# ADD_SUBDIRECTORY(i18n) |
5 |
ADD_SUBDIRECTORY(loki) |
5 |
# Default: loki as 3rd party lib! |
|
|
6 |
IF (WANT_INTERNAL_LOKI) |
7 |
ADD_SUBDIRECTORY(loki) |
8 |
ENDIF(WANT_INTERNAL_LOKI) |
6 |
IF (WIN32) |
9 |
IF (WIN32) |
7 |
ADD_SUBDIRECTORY(windows) |
10 |
ADD_SUBDIRECTORY(windows) |
8 |
ENDIF (WIN32) |
11 |
ENDIF (WIN32) |
Lines 433-439
Link Here
|
433 |
QT4_ADD_RESOURCES(TORA_RCC_SRCS ${TORA_RCC_FILES}) |
436 |
QT4_ADD_RESOURCES(TORA_RCC_SRCS ${TORA_RCC_FILES}) |
434 |
|
437 |
|
435 |
|
438 |
|
436 |
LINK_DIRECTORIES(./loki) |
439 |
IF (WANT_INTERNAL_LOKI) |
|
|
440 |
LINK_DIRECTORIES(./loki) |
441 |
ENDIF(WANT_INTERNAL_LOKI) |
437 |
IF (WIN32) |
442 |
IF (WIN32) |
438 |
LINK_DIRECTORIES(./windows) |
443 |
LINK_DIRECTORIES(./windows) |
439 |
ENDIF (WIN32) |
444 |
ENDIF (WIN32) |
Lines 442-448
Link Here
|
442 |
ENDIF (WANT_INTERNAL_QSCINTILLA) |
447 |
ENDIF (WANT_INTERNAL_QSCINTILLA) |
443 |
|
448 |
|
444 |
|
449 |
|
445 |
SET(TORA_LOKI_LIB "tora_loki_lib") |
450 |
IF (WANT_INTERNAL_LOKI) |
|
|
451 |
SET(LOKI_LIBRARIES "tora_loki_lib") |
452 |
SET(LOKI_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/loki/include) |
453 |
ENDIF(WANT_INTERNAL_LOKI) |
446 |
IF (WANT_INTERNAL_QSCINTILLA) |
454 |
IF (WANT_INTERNAL_QSCINTILLA) |
447 |
SET (TORA_QSCINTILLA_LIB tora_qscintilla2_lib) |
455 |
SET (TORA_QSCINTILLA_LIB tora_qscintilla2_lib) |
448 |
ENDIF (WANT_INTERNAL_QSCINTILLA) |
456 |
ENDIF (WANT_INTERNAL_QSCINTILLA) |
Lines 458-464
Link Here
|
458 |
${CMAKE_CURRENT_SOURCE_DIR} |
466 |
${CMAKE_CURRENT_SOURCE_DIR} |
459 |
${CMAKE_BINARY_DIR} |
467 |
${CMAKE_BINARY_DIR} |
460 |
${QT_INCLUDES} |
468 |
${QT_INCLUDES} |
461 |
${CMAKE_CURRENT_SOURCE_DIR}/loki/include |
469 |
${LOKI_INCLUDE_DIRS} |
462 |
${CMAKE_CURRENT_SOURCE_DIR}/otl |
470 |
${CMAKE_CURRENT_SOURCE_DIR}/otl |
463 |
) |
471 |
) |
464 |
|
472 |
|
Lines 529-535
Link Here
|
529 |
ENDIF (POSTGRESQL_LIBRARIES) |
537 |
ENDIF (POSTGRESQL_LIBRARIES) |
530 |
|
538 |
|
531 |
# static |
539 |
# static |
532 |
TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_LOKI_LIB}) |
540 |
TARGET_LINK_LIBRARIES(${EXE_NAME} ${LOKI_LIBRARIES}) |
533 |
IF (WANT_INTERNAL_QSCINTILLA) |
541 |
IF (WANT_INTERNAL_QSCINTILLA) |
534 |
TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_QSCINTILLA_LIB} ${QT_LIBRARIES}) |
542 |
TARGET_LINK_LIBRARIES(${EXE_NAME} ${TORA_QSCINTILLA_LIB} ${QT_LIBRARIES}) |
535 |
ENDIF (WANT_INTERNAL_QSCINTILLA) |
543 |
ENDIF (WANT_INTERNAL_QSCINTILLA) |