From d459eec68c14e9741110059dc6da845e6d4f0736 Mon Sep 17 00:00:00 2001 From: danzeeeman Date: Tue, 17 Dec 2019 12:31:04 -0500 Subject: [PATCH] feature ADDON_FRAMEWORKS_EXCLUDE to exclude frameworks from libs folder --- ofxProjectGenerator/src/addons/ofAddon.cpp | 7 ++++++- ofxProjectGenerator/src/addons/ofAddon.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ofxProjectGenerator/src/addons/ofAddon.cpp b/ofxProjectGenerator/src/addons/ofAddon.cpp index 670440304..b6ef0f4f3 100644 --- a/ofxProjectGenerator/src/addons/ofAddon.cpp +++ b/ofxProjectGenerator/src/addons/ofAddon.cpp @@ -138,7 +138,7 @@ bool ofAddon::checkCorrectVariable(string variable, ConfigParseState state){ variable == "ADDON_FRAMEWORKS" || variable == "ADDON_SOURCES" || variable == "ADDON_OBJC_SOURCES" || variable == "ADDON_CPP_SOURCES" || variable == "ADDON_HEADER_SOURCES" || variable == "ADDON_DATA" || - variable == "ADDON_LIBS_EXCLUDE" || variable == "ADDON_SOURCES_EXCLUDE" || variable == "ADDON_INCLUDES_EXCLUDE" || + variable == "ADDON_LIBS_EXCLUDE" || variable == "ADDON_SOURCES_EXCLUDE" || variable == "ADDON_INCLUDES_EXCLUDE" || variable == "ADDON_FRAMEWORKS_EXCLUDE" || variable == "ADDON_DLLS_TO_COPY" || variable == "ADDON_DEFINES"); case Unknown: @@ -325,6 +325,10 @@ void ofAddon::parseVariableValue(string variable, string value, bool addToValue, addReplaceStringVector(excludeIncludes,value,"",addToValue); } + if (variable == "ADDON_FRAMEWORKS_EXCLUDE") { + addReplaceStringVector(excludeFrameworks, value, "", addToValue); + } + if (variable == "ADDON_DEFINES") { addReplaceStringVector(defines, value, "", addToValue); } @@ -433,6 +437,7 @@ void ofAddon::parseConfig(){ exclude(objcsrcFiles,excludeSources); exclude(headersrcFiles,excludeSources); exclude(propsFiles, excludeSources); + exclude(frameworks, excludeFrameworks); exclude(libs,excludeLibs); ofLogVerbose("ofAddon") << "libs after exclusions " << libs.size(); diff --git a/ofxProjectGenerator/src/addons/ofAddon.h b/ofxProjectGenerator/src/addons/ofAddon.h index b7b1fe8aa..e0c9d18dc 100644 --- a/ofxProjectGenerator/src/addons/ofAddon.h +++ b/ofxProjectGenerator/src/addons/ofAddon.h @@ -100,6 +100,7 @@ class ofAddon { std::vector excludeLibs; std::vector excludeSources; std::vector excludeIncludes; + std::vector excludeFrameworks; }; #endif /* OFADDON_H_ */