cmake: Merge standalone detection into single conditional
This commit is contained in:
parent
65afefd0ba
commit
583ba282f8
|
|
@ -25,16 +25,25 @@ else()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Configure Type
|
# Detect if we are building with OBS Studio (different from Grouped builds)
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
# Detect if we are building by ourselves or as part of something else.
|
set(STANDALONE ON)
|
||||||
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_LIST_DIR}")
|
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_LIST_DIR}")
|
||||||
set(GROUPED OFF)
|
set(GROUPED OFF)
|
||||||
set(PREFIX "")
|
set(PREFIX "")
|
||||||
else()
|
else()
|
||||||
set(GROUPED ON)
|
set(GROUPED ON)
|
||||||
set(PREFIX "StreamFX_")
|
set(PREFIX "StreamFX_")
|
||||||
|
if(GROUPED AND (TARGET libobs))
|
||||||
|
set(STANDALONE OFF)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
|
if(STANDALONE)
|
||||||
|
message(STATUS "${LOGPREFIX} This is a standalone build, please make sure you've followed the instructions.")
|
||||||
|
else()
|
||||||
|
message(STATUS "${LOGPREFIX} This is a combined build.")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
@ -256,22 +265,6 @@ set(D_PLATFORM_INSTR ${ARCH_INST})
|
||||||
set(D_PLATFORM_ARCH ${ARCH_INST})
|
set(D_PLATFORM_ARCH ${ARCH_INST})
|
||||||
message(STATUS "${LOGPREFIX} Taget is ${D_PLATFORM_BITS}bit ${ARCH_INST} with a pointer size of ${D_PLATFORM_BITS_PTR}bit.")
|
message(STATUS "${LOGPREFIX} Taget is ${D_PLATFORM_BITS}bit ${ARCH_INST} with a pointer size of ${D_PLATFORM_BITS_PTR}bit.")
|
||||||
|
|
||||||
################################################################################
|
|
||||||
# Detect if we are building with OBS Studio (different from Grouped builds)
|
|
||||||
################################################################################
|
|
||||||
|
|
||||||
set(STANDALONE ON)
|
|
||||||
if(GROUPED AND (TARGET libobs))
|
|
||||||
set(STANDALONE OFF)
|
|
||||||
endif()
|
|
||||||
if(STANDALONE)
|
|
||||||
message(STATUS "${LOGPREFIX} This is a standalone build, please make sure you've followed the instructions.")
|
|
||||||
set(${PREFIX}OBS_NATIVE OFF)
|
|
||||||
else()
|
|
||||||
message(STATUS "${LOGPREFIX} This is a combined build.")
|
|
||||||
set(${PREFIX}OBS_NATIVE ON)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
################################################################################
|
################################################################################
|
||||||
# Options
|
# Options
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
@ -955,7 +948,7 @@ feature_updater(OFF)
|
||||||
set(HAVE_CURL OFF)
|
set(HAVE_CURL OFF)
|
||||||
if(REQUIRE_CURL)
|
if(REQUIRE_CURL)
|
||||||
if(D_PLATFORM_WINDOWS)
|
if(D_PLATFORM_WINDOWS)
|
||||||
if(${PREFIX}OBS_NATIVE) # Already defined by OBS
|
if(NOT STANDALONE) # Already defined by OBS
|
||||||
set(CURL_LIBRARIES "${CURL_LIB}")
|
set(CURL_LIBRARIES "${CURL_LIB}")
|
||||||
set(CURL_INCLUDE_DIRS "${CURL_INCLUDE_DIR}")
|
set(CURL_INCLUDE_DIRS "${CURL_INCLUDE_DIR}")
|
||||||
else()
|
else()
|
||||||
|
|
@ -2104,7 +2097,7 @@ endif()
|
||||||
# Installation
|
# Installation
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
if(${PREFIX}OBS_NATIVE)
|
if(NOT STANDALONE)
|
||||||
# Grouped builds don't offer standalone services.
|
# Grouped builds don't offer standalone services.
|
||||||
install_obs_plugin_with_data(${PROJECT_NAME} data)
|
install_obs_plugin_with_data(${PROJECT_NAME} data)
|
||||||
|
|
||||||
|
|
@ -2250,7 +2243,7 @@ endif()
|
||||||
# Packaging
|
# Packaging
|
||||||
################################################################################
|
################################################################################
|
||||||
|
|
||||||
if(NOT ${PREFIX}OBS_NATIVE)
|
if(STANDALONE)
|
||||||
# Packaging
|
# Packaging
|
||||||
if(NOT PACKAGE_SUFFIX)
|
if(NOT PACKAGE_SUFFIX)
|
||||||
set(_PACKAGE_SUFFIX_OVERRIDE "${VERSION_STRING}")
|
set(_PACKAGE_SUFFIX_OVERRIDE "${VERSION_STRING}")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue