From 2644f8ffc5b826718f375475158dcc6993da0e37 Mon Sep 17 00:00:00 2001 From: "C. J. Howard" Date: Thu, 15 Oct 2020 23:20:14 -0700 Subject: [PATCH] Only add antkeeper-data external project if directory exists --- CMakeLists.txt | 30 ++++++++++++++++-------------- modules/antkeeper-source | 2 +- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a9234d..a617920 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -222,20 +222,22 @@ ExternalProject_Add(antkeeper-source "-DCMAKE_CXX_FLAGS_RELEASE='${CMAKE_CXX_FLAGS_RELEASE}'" 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}" - "-DBLENDER=${BLENDER}" - "-DINKSCAPE=${INKSCAPE}" - BUILD_ALWAYS 1) +# Build antkeeper-data module (if exists) +if(IS_DIRECTORY ${MODULE_SOURCE_DIR}/antkeeper-data) + 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}" + "-DBLENDER=${BLENDER}" + "-DINKSCAPE=${INKSCAPE}" + BUILD_ALWAYS 1) +endif() # Create install target install(DIRECTORY "${PACKAGE_INSTALL_DIR}/" DESTINATION . COMPONENT "package" USE_SOURCE_PERMISSIONS FILES_MATCHING PATTERN "*") diff --git a/modules/antkeeper-source b/modules/antkeeper-source index 8a13e2c..eda8265 160000 --- a/modules/antkeeper-source +++ b/modules/antkeeper-source @@ -1 +1 @@ -Subproject commit 8a13e2c18e609a4a3a638ad6fe75399de25db599 +Subproject commit eda82650c9978cb75ae344c404a3abeb76bef5d1