update ChangeLog

update CmakeLists
update PKGBUILDs
fix GUI building
This commit is contained in:
arcan1s
2015-01-12 01:14:40 +03:00
parent 582459d174
commit cf12b3627e
44 changed files with 354 additions and 246 deletions

View File

@ -15,5 +15,5 @@ add_subdirectory (${SUBPROJECT_SOURCE_DIR})
install (DIRECTORY ${SUBPROJECT_INCLUDE_DIR}/ DESTINATION include/)
# documentation
if (BUILD_DOCS)
include (docs.cmake)
include (docs.cmake)
endif ()

View File

@ -1,9 +1,5 @@
# doxygen documentation
find_package (Doxygen)
if (NOT DOXYGEN_FOUND)
message (STATUS "WARNING: Doxygen not found - Reference manual will not be created")
return ()
endif ()
configure_file (doxygen.conf.in ${CMAKE_CURRENT_BINARY_DIR}/doxygen.conf)
add_custom_target (oxygen-docs ALL COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxygen.conf)

View File

@ -12,16 +12,16 @@ include_directories (${SUBPROJECT_INCLUDE_DIR}
${PROJECT_TRDPARTY_DIR})
if (USE_QT5)
find_package(Qt5 COMPONENTS Core REQUIRED)
add_definitions(${Qt5Core_DEFINITIONS})
include_directories (${Qt5Core_INCLUDE_DIRS})
set (QT_NEEDED_LIBS ${Qt5Core_LIBRARIES})
qt5_wrap_cpp (MOC_SOURCES ${HEADERS})
find_package (Qt5 COMPONENTS Core REQUIRED)
add_definitions (${Qt5Core_DEFINITIONS})
include_directories (${Qt5Core_INCLUDE_DIRS})
set (QT_NEEDED_LIBS ${Qt5Core_LIBRARIES})
qt5_wrap_cpp (MOC_SOURCES ${HEADERS})
else ()
find_package (Qt4 COMPONENTS QtCore REQUIRED)
include (${QT_USE_FILE})
set (QT_NEEDED_LIBS ${QT_QTCORE_LIBRARY})
qt4_wrap_cpp (MOC_SOURCES ${HEADERS})
find_package (Qt4 COMPONENTS QtCore REQUIRED)
include (${QT_USE_FILE})
set (QT_NEEDED_LIBS ${QT_QTCORE_LIBRARY})
qt4_wrap_cpp (MOC_SOURCES ${HEADERS})
endif()
add_library (${SUBPROJECT} SHARED ${SOURCES} ${HEADERS} ${MOC_SOURCES})