fix ios xcframeworks to be like normal xcframeworks - closes openframeworks/openFrameworks#8368 (#622)

Author: ofTheo

commandLine/src/addons/ofAddon.cpp

@@ -13,7 +13,7 @@
 
 
 
-void ofAddon::getFrameworksRecursively(const fs::path & path, string platform) {
+void ofAddon::getFrameworksRecursively(const fs::path & path, string platform, string packageTarget) {
 //	alert ("getFrameworksRecursively for " + platform + " : " + path.string(), 34);
 	if (!fs::exists(path) || !fs::is_directory(path)) return;
 
@@ -33,7 +33,7 @@ void ofAddon::getFrameworksRecursively(const fs::path & path, string platform) {
 						frameworks.emplace_back(f.string());
 					}
 					if (f.extension() == ".xcframework") {
-						if( platform != "macos" && platform != "osx" ){ //we don't want to add xcFrameworks for osx and just treat them like lib folders
+						if( packageTarget == "ios" || packageTarget == "tvos" ){ //we don't want to add xcFrameworks for osx and just treat them like lib folders
 						xcframeworks.emplace_back(f.string());
 						}
 					}
@@ -793,11 +793,13 @@ void ofAddon::parseLibsPath(const fs::path & libsPath, const fs::path & parentFo
 
 	if (platform == "osx"  || platform == "macos" || platform == "ios" || platform == "tvos"){
 		// Horrible hack to make it work with the bad idea of renaming osx to macos
-		getLibsRecursively(libsPath, libFiles, libs, "macos");
-		getLibsRecursively(libsPath, libFiles, libs, "osx");
+		// Note: we have to pass the platform through so we can do different things for osx and ios/tvos target as they both use "macos" for some reason
+		getLibsRecursively(libsPath, libFiles, libs, "macos", "", "", platform);
+		getLibsRecursively(libsPath, libFiles, libs, "osx", "", "", platform);
 
-		getFrameworksRecursively(libsPath, "macos");
-		getFrameworksRecursively(libsPath, "osx");
+		// Note: we have to pass the platform through so we can do different things for osx and ios/tvos target as they both use "macos" for some reason
+		getFrameworksRecursively(libsPath, "macos", platform);
+		getFrameworksRecursively(libsPath, "osx", platform);
 //		getXCFrameworksRecursively(libsPath, "macos");
 //		getXCFrameworksRecursively(libsPath, "osx");
 

commandLine/src/addons/ofAddon.h

@@ -138,7 +138,7 @@ class ofAddon {
 	ofAddon() = default;
 	ofAddon(const ofAddon& other);
 
-	void getFrameworksRecursively(const fs::path & path, string platform = "");
+	void getFrameworksRecursively(const fs::path & path, string platform, string packageTarget = "");
 
 	static string cleanName(const string& name);
 

commandLine/src/utils/Utils.cpp

@@ -321,7 +321,7 @@ void getDllsRecursively(const fs::path & path, std::vector<fs::path> & dlls, str
 }
 
 
-void getLibsRecursively(const fs::path & path, std::vector < fs::path > & libFiles, std::vector < LibraryBinary > & libLibs, string platform, string arch, string target) {
+void getLibsRecursively(const fs::path & path, std::vector < fs::path > & libFiles, std::vector < LibraryBinary > & libLibs, string platform, string arch, string target, string actualTarget ) {
 //	alert ("getLibsRecursively " + path.string(), 34);
 //	alert ("platform " + platform, 34);
 //	alert ("arch " + arch, 34);
@@ -341,7 +341,7 @@ void getLibsRecursively(const fs::path & path, std::vector < fs::path > & libFil
 
 		if (fs::is_directory(f)) {
 			// on osx, framework is a directory, let's not parse it....
-			if ((f.extension() == ".framework") || (f.extension() == ".xcframework" && (platform != "osx" && platform != "macos")) ) { //we want to treat .xcframeworks as regular libs for macos
+			if ((f.extension() == ".framework") || (f.extension() == ".xcframework" && (actualTarget != "osx" && actualTarget != "macos")) ) { //we want to treat .xcframeworks as regular libs for macos
 				it.disable_recursion_pending();
 				continue;
 			} 

commandLine/src/utils/Utils.h

@@ -77,7 +77,7 @@ int countSubdirectories(const fs::path &path);
 void getFoldersRecursively(const fs::path & path, std::vector < fs::path > & folderNames, string platform);
 void getFilesRecursively(const fs::path & path, std::vector < string > & fileNames);
 void getFilesRecursively(const fs::path & path, std::vector < fs::path > & fileNames);
-void getLibsRecursively(const fs::path & path, std::vector < fs::path > & libFiles, std::vector < LibraryBinary > & libLibs, string platform = "", string arch = "", string target = "");
+void getLibsRecursively(const fs::path & path, std::vector < fs::path > & libFiles, std::vector < LibraryBinary > & libLibs, string platform = "", string arch = "", string target = "", string actualTarget = "");
 
 void getPropsRecursively(const fs::path & path, std::vector < fs::path > & props, const string & platform);
 void getDllsRecursively(const fs::path & path, std::vector < fs::path > & dlls, string platform);