commit before merging

This commit is contained in:
arcan1s
2014-04-06 23:22:13 +04:00
parent 72782a40c2
commit b983f4424e
4 changed files with 70 additions and 33 deletions

View File

@ -8,13 +8,14 @@ cmake_policy (SET CMP0015 NEW)
project (netctl-gui)
set (PROJECT_VERSION_MAJOR 1)
set (PROJECT_VERSION_MINOR 0)
set (PROJECT_VERSION_PATCH 3)
set (PROJECT_VERSION_PATCH 4)
set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
configure_file (${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
message (STATUS "Version: ${PROJECT_VERSION}")
# install options
option (USE_QT5 "Use Qt5 instead of Qt4" ON)
option (BUILD_GUI "Build GUI" ON)
option (BUILD_DATAENGINE "Build data engine" ON)
option (BUILD_PLASMOID "Build plasmoid" ON)
@ -33,13 +34,12 @@ if (BUILD_PLASMOID)
set (BUILD_DATAENGINE ON)
endif ()
add_subdirectory (icons)
if (BUILD_GUI)
add_subdirectory (gui)
endif ()
# if (BUILD_DATAENGINE)
# add_subdirectory (dataengine)
# endif ()
# if (BUILD_PLASMOID)
# add_subdirectory (plasmoid)
# endif ()
if (BUILD_DATAENGINE)
add_subdirectory (dataengine)
endif ()
if (BUILD_PLASMOID)
add_subdirectory (plasmoid)
endif ()