Skip to content

Commit

Permalink
[cmake] BUILD_DEP_TARGET move include and add docinfo
Browse files Browse the repository at this point in the history
  • Loading branch information
fuzzard committed Mar 7, 2022
1 parent a4ed6ec commit 419dc83
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 8 deletions.
1 change: 0 additions & 1 deletion cmake/modules/FindCrossGUID.cmake
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
if(ENABLE_INTERNAL_CROSSGUID)
include(ExternalProject)
include(cmake/scripts/common/ModuleHelpers.cmake)

set(MODULE_LC crossguid)
Expand Down
1 change: 0 additions & 1 deletion cmake/modules/FindDav1d.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
# DAV1D_LIBRARIES - the dav1d libraries

if(ENABLE_INTERNAL_DAV1D)
include(ExternalProject)
include(cmake/scripts/common/ModuleHelpers.cmake)

set(MODULE_LC dav1d)
Expand Down
1 change: 0 additions & 1 deletion cmake/modules/FindFlatBuffers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
# FLATBUFFERS_MESSAGES_INCLUDE_DIR - the directory for generated headers

if(ENABLE_INTERNAL_FLATBUFFERS)
include(ExternalProject)
include(cmake/scripts/common/ModuleHelpers.cmake)

set(MODULE_LC flatbuffers)
Expand Down
1 change: 0 additions & 1 deletion cmake/modules/FindFmt.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
# fmt - The Fmt library

if(ENABLE_INTERNAL_FMT)
include(ExternalProject)
include(cmake/scripts/common/ModuleHelpers.cmake)

set(MODULE_LC fmt)
Expand Down
1 change: 0 additions & 1 deletion cmake/modules/FindFstrcmp.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

if(ENABLE_INTERNAL_FSTRCMP)
find_program(LIBTOOL libtool REQUIRED)
include(ExternalProject)
include(cmake/scripts/common/ModuleHelpers.cmake)

set(MODULE_LC fstrcmp)
Expand Down
1 change: 0 additions & 1 deletion cmake/modules/FindRapidJSON.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
# RapidJSON_INCLUDE_DIRS - the RapidJSON parser include directory
#
if(ENABLE_INTERNAL_RapidJSON)
include(ExternalProject)
include(cmake/scripts/common/ModuleHelpers.cmake)

set(MODULE_LC rapidjson)
Expand Down
1 change: 0 additions & 1 deletion cmake/modules/FindSpdlog.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
# Spdlog::Spdlog - The Spdlog library

if(ENABLE_INTERNAL_SPDLOG)
include(ExternalProject)
include(cmake/scripts/common/ModuleHelpers.cmake)

set(MODULE_LC spdlog)
Expand Down
1 change: 0 additions & 1 deletion cmake/modules/FindUdfread.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
# UDFREAD_DEFINITIONS - the udfread definitions

if(ENABLE_INTERNAL_UDFREAD)
include(ExternalProject)
include(cmake/scripts/common/ModuleHelpers.cmake)

set(MODULE_LC udfread)
Expand Down
13 changes: 13 additions & 0 deletions cmake/scripts/common/ModuleHelpers.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,20 @@ macro(SETUP_BUILD_VARS)
endmacro()

# Macro to create externalproject_add target
#
# Common usage
#
# CMAKE_ARGS: cmake(required)
# PATCH_COMMAND: ALL(optional)
# CONFIGURE_COMMAND: autoconf(required), meson(required)
# BUILD_COMMAND: autoconf(required), meson(required), cmake(optional)
# INSTALL_COMMAND: autoconf(required), meson(required), cmake(optional)
# BUILD_IN_SOURCE: ALL(optional)
# BUILD_BYPRODUCTS: ALL(optional)
#
macro(BUILD_DEP_TARGET)
include(ExternalProject)

if(CMAKE_ARGS)
set(CMAKE_ARGS CMAKE_ARGS ${CMAKE_ARGS})
endif()
Expand Down

0 comments on commit 419dc83

Please sign in to comment.