From 899557699fffea0b8c82278ef19a1602936edb1c Mon Sep 17 00:00:00 2001 From: jp9000 Date: Mon, 1 Jun 2015 16:06:29 -0700 Subject: [PATCH] libobs: Add OBS_UNIX_STRUCTURE config variable This obsconfig.h variable will be true or false depending on whether the project is configured with the cmake UNIX_STRUCTURE variable or not. --- cmake/Modules/ObsHelpers.cmake | 2 ++ libobs/obsconfig.h.in | 1 + 2 files changed, 3 insertions(+) diff --git a/cmake/Modules/ObsHelpers.cmake b/cmake/Modules/ObsHelpers.cmake index f951830bb..398fb716e 100644 --- a/cmake/Modules/ObsHelpers.cmake +++ b/cmake/Modules/ObsHelpers.cmake @@ -77,6 +77,7 @@ if(NOT UNIX_STRUCTURE) endif() set(OBS_CMAKE_DESTINATION "cmake") set(OBS_INCLUDE_DESTINATION "include") + set(OBS_UNIX_STRUCTURE "0") else() if(NOT OBS_MULTIARCH_SUFFIX AND DEFINED ENV{OBS_MULTIARCH_SUFFIX}) set(OBS_MULTIARCH_SUFFIX "$ENV{OBS_MULTIARCH_SUFFIX}") @@ -98,6 +99,7 @@ else() set(OBS_DATA_PATH "${OBS_DATA_DESTINATION}") set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/") set(OBS_RELATIVE_PREFIX "../") + set(OBS_UNIX_STRUCTURE "1") endif() function(obs_finish_bundle) diff --git a/libobs/obsconfig.h.in b/libobs/obsconfig.h.in index f6b636fd2..b49fd7571 100644 --- a/libobs/obsconfig.h.in +++ b/libobs/obsconfig.h.in @@ -6,3 +6,4 @@ #define OBS_INSTALL_PREFIX "@OBS_INSTALL_PREFIX@" #define OBS_PLUGIN_DESTINATION "@OBS_PLUGIN_DESTINATION@" #define OBS_RELATIVE_PREFIX "@OBS_RELATIVE_PREFIX@" +#define OBS_UNIX_STRUCTURE @OBS_UNIX_STRUCTURE@