From 1a867856829e407ec8d6579ca1b1db7853d5f788 Mon Sep 17 00:00:00 2001 From: "C. J. Howard" Date: Sun, 9 Jun 2019 23:26:37 +0800 Subject: [PATCH] Build antkeeper-data module --- CMakeLists.txt | 15 ++++++++++++++- modules/antkeeper-data | 2 +- modules/antkeeper-source | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index deda0d7..687899d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,7 +117,7 @@ ExternalProject_Add(entt # Build antkeeper-source module ExternalProject_Add(antkeeper-source - DEPENDS vmq entt + DEPENDS openal-soft vmq entt SOURCE_DIR ${MODULE_SOURCE_DIR}/antkeeper-source BINARY_DIR ${MODULE_BUILD_DIR}/antkeeper-source INSTALL_DIR ${PACKAGE_INSTALL_DIR} @@ -128,6 +128,19 @@ ExternalProject_Add(antkeeper-source "-DCMAKE_PREFIX_PATH=${MODULE_INSTALL_DIR}" BUILD_ALWAYS 1) +# Build antkeeper-data module +ExternalProject_Add(antkeeper-data + DEPENDS antkeeper-source + SOURCE_DIR ${MODULE_SOURCE_DIR}/antkeeper-data + BINARY_DIR ${MODULE_BUILD_DIR}/antkeeper-data + INSTALL_DIR ${PACKAGE_INSTALL_DIR} + CMAKE_ARGS + "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}" + "-DCMAKE_INSTALL_PREFIX=${PACKAGE_INSTALL_DIR}" + "-DPACKAGE_PLATFORM=${PACKAGE_PLATFORM}" + "-DCMAKE_PREFIX_PATH=${MODULE_INSTALL_DIR}" + BUILD_ALWAYS 1) + # Create install target install(DIRECTORY "${PACKAGE_INSTALL_DIR}/" DESTINATION . COMPONENT "package" USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN "*") diff --git a/modules/antkeeper-data b/modules/antkeeper-data index 644dff6..45abee3 160000 --- a/modules/antkeeper-data +++ b/modules/antkeeper-data @@ -1 +1 @@ -Subproject commit 644dff6af0fd58a9ac1ce622a0918a7246aa054e +Subproject commit 45abee3bb3a4ee9394405786affbe45361d3d15e diff --git a/modules/antkeeper-source b/modules/antkeeper-source index fefb73c..7e10661 160000 --- a/modules/antkeeper-source +++ b/modules/antkeeper-source @@ -1 +1 @@ -Subproject commit fefb73c39b641d6b80676b134746240ea0482cee +Subproject commit 7e1066175c77b59252811a0b285881e0b94f8cbc