Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Education
Artikulate
Commits
3dd5781a
Commit
3dd5781a
authored
Aug 10, 2014
by
Andreas Cord-Landwehr
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Port build system to KF5.
parent
6ede975c
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
30 additions
and
23 deletions
+30
-23
CMakeLists.txt
CMakeLists.txt
+18
-12
icons/CMakeLists.txt
icons/CMakeLists.txt
+4
-3
liblearnerprofile/src/CMakeLists.txt
liblearnerprofile/src/CMakeLists.txt
+1
-1
libsound/src/CMakeLists.txt
libsound/src/CMakeLists.txt
+1
-1
src/CMakeLists.txt
src/CMakeLists.txt
+6
-6
No files found.
CMakeLists.txt
View file @
3dd5781a
...
...
@@ -25,16 +25,27 @@
project
(
artikulate
)
find_package
(
KDE4 4.11.1 REQUIRED
)
include
(
KDE4Defaults
)
cmake_minimum_required
(
VERSION 2.8.12
)
find_package
(
ECM 0.0.11 REQUIRED NO_MODULE
)
set
(
CMAKE_MODULE_PATH
${
ECM_MODULE_PATH
}
${
ECM_KDE_MODULE_DIR
}
)
include_directories
(
${
CMAKE_SOURCE_DIR
}
${
CMAKE_BINARY_DIR
}
${
KDE4_INCLUDES
}
${
QT4_INCLUDES
}
)
add_definitions
(
-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS -fexceptions
)
include
(
KDEInstallDirs
)
include
(
KDECMakeSettings
)
include
(
KDECompilerSettings
)
include
(
FeatureSummary
)
find_package
(
Qt5 REQUIRED COMPONENTS
Widgets
)
find_package
(
KF5 REQUIRED COMPONENTS
Config
I18n
)
# subdirectories to build
add_subdirectory
(
data
)
add_subdirectory
(
schemes
)
add_subdirectory
(
doc
)
#
add_subdirectory(doc)
//FIXME
add_subdirectory
(
src
)
add_subdirectory
(
sounds
)
add_subdirectory
(
images
)
...
...
@@ -42,14 +53,9 @@ add_subdirectory(icons)
add_subdirectory
(
libsound
)
add_subdirectory
(
liblearnerprofile
)
# Build Tests if KDE_TEST is on
if
(
KDE4_BUILD_TESTS
)
enable_testing
()
add_subdirectory
(
autotests
)
endif
(
KDE4_BUILD_TESTS
)
# files to install in the artikulate project root directory
install
(
PROGRAMS artikulate.desktop DESTINATION
${
XDG_APPS_INSTALL_DIR
}
)
install
(
FILES artikulate.appdata.xml DESTINATION
${
SHARE_INSTALL_PREFIX
}
/appdata/
)
macro_display_feature_log
()
feature_summary
(
WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES
)
icons/CMakeLists.txt
View file @
3dd5781a
...
...
@@ -23,7 +23,8 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
###
add_subdirectory
(
actions
)
#
add_subdirectory(actions)
kde4_install_icons
(
${
ICON_INSTALL_DIR
}
)
kde4_update_iconcache
()
#FIXME
# kde4_install_icons(${ICON_INSTALL_DIR})
# kde4_update_iconcache()
liblearnerprofile/src/CMakeLists.txt
View file @
3dd5781a
...
...
@@ -32,7 +32,7 @@ set(learnerprofile_LIB_SRCS
models/learninggoalmodel.cpp
)
kde4_
add_library
(
artikulatelearnerprofile SHARED
${
learnerprofile_LIB_SRCS
}
)
add_library
(
artikulatelearnerprofile SHARED
${
learnerprofile_LIB_SRCS
}
)
target_link_libraries
(
artikulatelearnerprofile
...
...
libsound/src/CMakeLists.txt
View file @
3dd5781a
...
...
@@ -36,7 +36,7 @@ set(sound_LIB_SRCS
qtgstreameroutputbackend.cpp
)
kde4_
add_library
(
artikulatesound SHARED
${
sound_LIB_SRCS
}
)
add_library
(
artikulatesound SHARED
${
sound_LIB_SRCS
}
)
target_link_libraries
(
artikulatesound
...
...
src/CMakeLists.txt
View file @
3dd5781a
...
...
@@ -64,11 +64,11 @@ set(artikulateCore_SRCS
)
# compile UI files
kde4_add_ui_files
(
artikulateCore_SRCS
qt5_wrap_ui
(
artikulateCore_SRCS
ui/newcoursedialog.ui
)
k
de4
_add_kcfg_files
(
artikulateCore_SRCS settings.kcfgc
)
kde4_
add_library
(
artikulatecore SHARED
${
artikulateCore_SRCS
}
)
k
config
_add_kcfg_files
(
artikulateCore_SRCS settings.kcfgc
)
add_library
(
artikulatecore SHARED
${
artikulateCore_SRCS
}
)
target_link_libraries
(
artikulatecore
LINK_PRIVATE
artikulatelearnerprofile
...
...
@@ -118,13 +118,13 @@ set(artikulate_SRCS
declarativeitems/applicationbackground.cpp
)
kde4_add_ui_files
(
artikulate_SRCS
qt5_wrap_ui
(
artikulate_SRCS
ui/resourcesdialogpage.ui
ui/sounddevicedialogpage.ui
ui/appearencedialogpage.ui
)
k
de4
_add_kcfg_files
(
artikulate_SRCS settings.kcfgc
)
kde4_
add_executable
(
artikulate
${
artikulate_SRCS
}
)
k
config
_add_kcfg_files
(
artikulate_SRCS settings.kcfgc
)
add_executable
(
artikulate
${
artikulate_SRCS
}
)
target_link_libraries
(
artikulate
LINK_PRIVATE
artikulatelearnerprofile
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment