Commit c59a72f6 authored by Andreas Cord-Landwehr's avatar Andreas Cord-Landwehr
Browse files

ecm_optional_add_subdirectory.

parent 60d92704
...@@ -32,6 +32,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) ...@@ -32,6 +32,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
include(KDEInstallDirs) include(KDEInstallDirs)
include(KDECMakeSettings) include(KDECMakeSettings)
include(KDECompilerSettings) include(KDECompilerSettings)
include(ECMOptionalAddSubdirectory)
include(FeatureSummary) include(FeatureSummary)
find_package(Qt5 REQUIRED COMPONENTS find_package(Qt5 REQUIRED COMPONENTS
...@@ -53,19 +54,18 @@ find_package(KF5 CONFIG REQUIRED COMPONENTS ...@@ -53,19 +54,18 @@ find_package(KF5 CONFIG REQUIRED COMPONENTS
) )
# subdirectories to build # subdirectories to build
add_subdirectory(data) ecm_optional_add_subdirectory(data)
add_subdirectory(schemes) ecm_optional_add_subdirectory(schemes)
# add_subdirectory(doc) //FIXME # ecm_optional_add_subdirectory(doc) //FIXME
add_subdirectory(src) ecm_optional_add_subdirectory(src)
add_subdirectory(sounds) ecm_optional_add_subdirectory(sounds)
add_subdirectory(images) ecm_optional_add_subdirectory(images)
add_subdirectory(icons) ecm_optional_add_subdirectory(icons)
add_subdirectory(libsound) ecm_optional_add_subdirectory(libsound)
add_subdirectory(liblearnerprofile) ecm_optional_add_subdirectory(liblearnerprofile)
# files to install in the artikulate project root directory # files to install in the artikulate project root directory
install(PROGRAMS artikulate.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) install(PROGRAMS artikulate.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
install(FILES artikulate.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/) install(FILES artikulate.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
...@@ -23,5 +23,5 @@ ...@@ -23,5 +23,5 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
### ###
add_subdirectory(languages) ecm_optional_add_subdirectory(languages)
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
### ###
#add_subdirectory(actions) #ecm_optional_add_subdirectory(actions)
#FIXME #FIXME
# kde4_install_icons(${ICON_INSTALL_DIR}) # kde4_install_icons(${ICON_INSTALL_DIR})
......
add_subdirectory(src) ecm_optional_add_subdirectory(src)
add_subdirectory(src) ecm_optional_add_subdirectory(src)
...@@ -29,7 +29,7 @@ set(ARTIKULATE_VERSION_PATCH 50) ...@@ -29,7 +29,7 @@ set(ARTIKULATE_VERSION_PATCH 50)
# set config files after packages are searched # set config files after packages are searched
configure_file("${artikulate_SOURCE_DIR}/version.h.cmake" "${artikulate_BINARY_DIR}/version.h" @ONLY) configure_file("${artikulate_SOURCE_DIR}/version.h.cmake" "${artikulate_BINARY_DIR}/version.h" @ONLY)
add_subdirectory(qml) ecm_optional_add_subdirectory(qml)
# set include directories # set include directories
include_directories( include_directories(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment