Правки
This commit is contained in:
parent
28bfad1960
commit
6b9db876fd
@ -4,11 +4,13 @@ include(ExternalProject)
|
|||||||
if(PreprocThirdparty_FIND_COMPONENTS STREQUAL "headers")
|
if(PreprocThirdparty_FIND_COMPONENTS STREQUAL "headers")
|
||||||
ExternalProject_Add(
|
ExternalProject_Add(
|
||||||
libpreproc
|
libpreproc
|
||||||
|
DEPENDS libpreprocmath
|
||||||
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libpreproc
|
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libpreproc
|
||||||
INSTALL_DIR ${CMAKE_BINARY_DIR}
|
INSTALL_DIR ${CMAKE_BINARY_DIR}
|
||||||
DOWNLOAD_COMMAND ""
|
DOWNLOAD_COMMAND ""
|
||||||
CONFIGURE_COMMAND
|
CONFIGURE_COMMAND
|
||||||
${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
|
${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
|
||||||
|
-DLIBPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR}
|
||||||
-DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR} ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
|
-DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR} ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
|
||||||
<SOURCE_DIR>
|
<SOURCE_DIR>
|
||||||
BUILD_COMMAND true
|
BUILD_COMMAND true
|
||||||
@ -16,15 +18,19 @@ if(PreprocThirdparty_FIND_COMPONENTS STREQUAL "headers")
|
|||||||
else()
|
else()
|
||||||
ExternalProject_Add(
|
ExternalProject_Add(
|
||||||
libpreproc
|
libpreproc
|
||||||
|
DEPENDS libpreprocmath
|
||||||
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libpreproc
|
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libpreproc
|
||||||
INSTALL_DIR ${CMAKE_BINARY_DIR}
|
INSTALL_DIR ${CMAKE_BINARY_DIR}
|
||||||
DOWNLOAD_COMMAND ""
|
DOWNLOAD_COMMAND ""
|
||||||
CONFIGURE_COMMAND
|
CONFIGURE_COMMAND
|
||||||
${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
|
${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}"
|
||||||
|
-DLIBPREPROCMATH_PREFIX=${CMAKE_BINARY_DIR}
|
||||||
-DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR} ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
|
-DCMLIB_MAIN_DIR=${CMLIB_MAIN_DIR} ${CMLIB_EXT_PROJ_DEFAULT_ARGS}
|
||||||
<SOURCE_DIR>)
|
<SOURCE_DIR>)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
set(LIBPREPROC_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
|
||||||
|
|
||||||
set(LIBPREPROC_PREFIX
|
set(LIBPREPROC_PREFIX
|
||||||
${CMAKE_BINARY_DIR}
|
${CMAKE_BINARY_DIR}
|
||||||
CACHE FILEPATH "" FORCE)
|
CACHE FILEPATH "" FORCE)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
# Подключение внешних проектов
|
# Подключение внешних проектов
|
||||||
include(ExternalProject)
|
include(ExternalProject)
|
||||||
|
|
||||||
if(${PreprocmathThirdparty_FIND_COMPONENTS} STREQUAL "headers")
|
if(PreprocmathThirdparty_FIND_COMPONENTS STREQUAL "headers")
|
||||||
ExternalProject_Add(
|
ExternalProject_Add(
|
||||||
libpreprocmath
|
libpreprocmath
|
||||||
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libpreprocmath
|
SOURCE_DIR ${CMAKE_SOURCE_DIR}/thirdparty/libpreprocmath
|
||||||
@ -25,6 +25,8 @@ else()
|
|||||||
<SOURCE_DIR>)
|
<SOURCE_DIR>)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
set(LIBPREPROCMATH_IS_EXTERNAL_PROJECT ON CACHE BOOL "" FORCE)
|
||||||
|
|
||||||
set(LIBPREPROCMATH_PREFIX
|
set(LIBPREPROCMATH_PREFIX
|
||||||
${CMAKE_BINARY_DIR}
|
${CMAKE_BINARY_DIR}
|
||||||
CACHE FILEPATH "" FORCE)
|
CACHE FILEPATH "" FORCE)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user