--- orig.CMakeLists.txt 2016-10-03 01:25:32.000000000 +0200
+++ CMakeLists.txt 2017-07-05 22:55:39.000000000 +0200
-project("DB Browser for SQLite")
+project("sqlitebrowser")
cmake_minimum_required(VERSION 2.8.7)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
set(CMAKE_BUILD_TYPE "Release")
# Paths for 64-bit windows builds
set(QHEXEDIT_DIR libs/qhexedit)
set(QCUSTOMPLOT_DIR libs/qcustomplot-source)
-set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
+# set(QSCINTILLA_DIR libs/qscintilla/Qt4Qt5)
set(ANTLR_DIR libs/antlr-2.7.7)
add_subdirectory(${QHEXEDIT_DIR})
add_subdirectory(${QCUSTOMPLOT_DIR})
-add_subdirectory(${QSCINTILLA_DIR})
+# add_subdirectory(${QSCINTILLA_DIR})
find_package(Qt5Widgets REQUIRED)
"${CMAKE_CURRENT_BINARY_DIR}"
+ ${QSCINTILLA_INCLUDE_DIR}
${ADDITIONAL_INCLUDE_PATHS}
qt5_use_modules(${PROJECT_NAME} Gui Widgets Network Test PrintSupport)
-add_dependencies(${PROJECT_NAME} qhexedit qcustomplot qscintilla2)
+# add_dependencies(${PROJECT_NAME} qhexedit qcustomplot qscintilla2)
+add_dependencies(${PROJECT_NAME} qhexedit qcustomplot)
add_dependencies(${PROJECT_NAME} antlr)
"${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}"
"${CMAKE_CURRENT_BINARY_DIR}/${QHEXEDIT_DIR}"
- "${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}"
- "${CMAKE_CURRENT_BINARY_DIR}/${QSCINTILLA_DIR}")
+ "${CMAKE_CURRENT_BINARY_DIR}/${QCUSTOMPLOT_DIR}")
link_directories("${CMAKE_CURRENT_BINARY_DIR}/${ANTLR_DIR}")
target_link_libraries(${PROJECT_NAME}
+ "-L${QSCINTILLA_LIB_DIR} -lqscintilla2_qt5"
add_subdirectory(src/tests)
install(FILES src/icons/${PROJECT_NAME}.png
DESTINATION share/icons/hicolor/256x256/apps/)
install(FILES distri/${PROJECT_NAME}.desktop.appdata.xml
DESTINATION share/appdata/)
-endif(UNIX AND NOT APPLE)
install(TARGETS ${PROJECT_NAME}