Updated plugin template and building system to use new FEBioConfig.cmake

michaelrossherron · michaelrossherron · commit 433a03077ca5 · 2026-01-14T14:45:10.000-07:00
diff --git a/FEBioStudio/DlgCreatePlugin.cpp b/FEBioStudio/DlgCreatePlugin.cpp
@@ -174,8 +174,6 @@ void CDlgCreatePlugin::accept()
 	config.headerTxt   = pluginTemplate->m_header;
 	config.sourceTxt   = pluginTemplate->m_source;
 	config.args        = ui->opsPage->GetOptions();
-	config.sdkInc      = ui->m_wnd->GetSDKIncludePath();
-	config.sdkLib      = ui->m_wnd->GetSDKLibraryPath();
     config.febioLibs   = febioLibs;
 	config.headerFile  = config.path + sep + config.className + ".h";
 	config.sourceFile  = config.path + sep + config.className + ".cpp";
@@ -258,8 +256,6 @@ void CDlgAddPluginClass::accept()
 	config.headerTxt = pluginTemplate->m_header;
 	config.sourceTxt = pluginTemplate->m_source;
 	config.args = ui->opsPage->GetOptions();
-	config.sdkInc = ui->m_wnd->GetSDKIncludePath();
-	config.sdkLib = ui->m_wnd->GetSDKLibraryPath();
     config.febioLibs = QStringList() << "FECore" << "FEBioMech";
 	config.headerFile = config.path + sep + config.className + ".h";
 	config.sourceFile = config.path + sep + config.className + ".cpp";
diff --git a/FEBioStudio/DlgSettings.cpp b/FEBioStudio/DlgSettings.cpp
@@ -1055,8 +1055,7 @@ CFEBioSettingsWidget::CFEBioSettingsWidget(QWidget* parent) : QWidget(parent)
 	layout->addLayout(pathLayout);
 
 	QFormLayout* f = new QFormLayout;
-	f->addRow("FEBio SDK Include path: ", m_sdkInc = new QLineEdit);
-	f->addRow("FEBio SDK Library path: ", m_sdkLib = new QLineEdit);
+	f->addRow("FEBio SDK path: ", m_sdkPath = new QLineEdit);
 	f->addRow("FEBio create plugin path:", m_pluginPath = new QLineEdit);
 	layout->addLayout(f);
 	 
@@ -1071,11 +1070,8 @@ QString CFEBioSettingsWidget::GetConfigFileName() { return m_configEdit->text();
 void CFEBioSettingsWidget::SetLoadConfigFlag(bool b) { m_loadConfig->setChecked(b); }
 void CFEBioSettingsWidget::SetConfigFileName(QString s) { m_configEdit->setText(s); }
 
-QString CFEBioSettingsWidget::GetSDKIncludePath() const { return m_sdkInc->text(); }
-void CFEBioSettingsWidget::SetSDKIncludePath(const QString& s) { m_sdkInc->setText(s); }
-
-QString CFEBioSettingsWidget::GetSDKLibraryPath() const { return m_sdkLib->text(); }
-void CFEBioSettingsWidget::SetSDKLibraryPath(const QString& s) { m_sdkLib->setText(s); }
+QString CFEBioSettingsWidget::GetSDKPath() const { return m_sdkPath->text(); }
+void CFEBioSettingsWidget::SetSDKPath(const QString& s) { m_sdkPath->setText(s); }
 
 QString CFEBioSettingsWidget::GetCreatePluginPath() const { return m_pluginPath->text(); }
 void CFEBioSettingsWidget::SetCreatePluginPath(const QString& s) { m_pluginPath->setText(s); }
@@ -1301,8 +1297,7 @@ void CDlgSettings::UpdateSettings()
 	ui->m_febio->SetLoadConfigFlag(m_pwnd->GetLoadConfigFlag());
 	ui->m_febio->SetConfigFileName(m_pwnd->GetConfigFileName());
 
-	ui->m_febio->SetSDKIncludePath(m_pwnd->GetSDKIncludePath());
-	ui->m_febio->SetSDKLibraryPath(m_pwnd->GetSDKLibraryPath());
+	ui->m_febio->SetSDKPath(m_pwnd->GetSDKPath());
 	ui->m_febio->SetCreatePluginPath(m_pwnd->GetCreatePluginPath());
 }
 
@@ -1447,8 +1442,7 @@ void CDlgSettings::apply()
 
 	m_pwnd->SetLoadConfigFlag(ui->m_febio->GetLoadConfigFlag());
 	m_pwnd->SetConfigFileName(ui->m_febio->GetConfigFileName());
-	m_pwnd->SetSDKIncludePath(ui->m_febio->GetSDKIncludePath());
-	m_pwnd->SetSDKLibraryPath(ui->m_febio->GetSDKLibraryPath());
+	m_pwnd->SetSDKPath(ui->m_febio->GetSDKPath());
 	m_pwnd->SetCreatePluginPath(ui->m_febio->GetCreatePluginPath());
 
 	m_pwnd->RedrawGL();
diff --git a/FEBioStudio/DlgSettings.h b/FEBioStudio/DlgSettings.h
@@ -175,11 +175,8 @@ class CFEBioSettingsWidget : public QWidget
 	void SetLoadConfigFlag(bool b);
 	void SetConfigFileName(QString s);
 
-	QString GetSDKIncludePath() const;
-	void SetSDKIncludePath(const QString& s);
-
-	QString GetSDKLibraryPath() const;
-	void SetSDKLibraryPath(const QString& s);
+	QString GetSDKPath() const;
+	void SetSDKPath(const QString& s);
 
 	QString GetCreatePluginPath() const;
 	void SetCreatePluginPath(const QString& s);
@@ -190,8 +187,7 @@ protected slots:
 private:
 	QCheckBox* m_loadConfig = nullptr;
 	QLineEdit* m_configEdit = nullptr;
-	QLineEdit* m_sdkInc = nullptr;
-	QLineEdit* m_sdkLib = nullptr;
+	QLineEdit* m_sdkPath = nullptr;
 	QLineEdit* m_pluginPath = nullptr;
 };
 
diff --git a/FEBioStudio/MainWindow.cpp b/FEBioStudio/MainWindow.cpp
@@ -1957,8 +1957,7 @@ void CMainWindow::writeSettings()
 		// FEBio
 		settings.setValue("loadFEBioConfigFile", ui->m_settings.loadFEBioConfigFile);
 		settings.setValue("febioConfigFileName", ui->m_settings.febioConfigFileName);
-		settings.setValue("FEBioSDKInclude", ui->m_settings.FEBioSDKInc);
-		settings.setValue("FEBioSDKLibrary", ui->m_settings.FEBioSDKLib);
+		settings.setValue("FEBioSDK", ui->m_settings.FEBioSDKPath);
 		settings.setValue("createPluginPath", ui->m_settings.createPluginPath);
 
 		// Lighting
@@ -2122,8 +2121,7 @@ void CMainWindow::readSettings()
 		ui->m_settings.loadFEBioConfigFile = settings.value("loadFEBioConfigFile", true).toBool();
 		ui->m_settings.febioConfigFileName = settings.value("febioConfigFileName", ui->m_settings.febioConfigFileName).toString();
 		QString defaultSDK = QFileInfo(QApplication::applicationDirPath() + QString(REL_ROOT) + "sdk/").absoluteFilePath();
-		ui->m_settings.FEBioSDKInc = settings.value("FEBioSDKInclude", defaultSDK + "include").toString();
-		ui->m_settings.FEBioSDKLib = settings.value("FEBioSDKLibrary", defaultSDK + "lib").toString();
+		ui->m_settings.FEBioSDKPath = settings.value("FEBioSDK", defaultSDK).toString();
 		ui->m_settings.createPluginPath = settings.value("createPluginPath", "").toString();
 
 		// Lighting
@@ -3635,12 +3633,10 @@ void CMainWindow::on_selectionChanged()
 
 CPluginManager* CMainWindow::GetPluginManager() { return &ui->m_pluginManager; }
 
-QString CMainWindow::GetSDKIncludePath() const { return ui->m_settings.FEBioSDKInc; }
-QString CMainWindow::GetSDKLibraryPath() const { return ui->m_settings.FEBioSDKLib; }
+QString CMainWindow::GetSDKPath() const { return ui->m_settings.FEBioSDKPath; }
 QString CMainWindow::GetCreatePluginPath() const { return ui->m_settings.createPluginPath; }
 
-void CMainWindow::SetSDKIncludePath(const QString& s) { ui->m_settings.FEBioSDKInc = s; }
-void CMainWindow::SetSDKLibraryPath(const QString& s) { ui->m_settings.FEBioSDKLib = s; }
+void CMainWindow::SetSDKPath(const QString& s) { ui->m_settings.FEBioSDKPath = s; }
 void CMainWindow::SetCreatePluginPath(const QString& s) { ui->m_settings.createPluginPath = s; }
 
 void CMainWindow::on_planecut_dataChanged()
diff --git a/FEBioStudio/MainWindow.h b/FEBioStudio/MainWindow.h
@@ -317,11 +317,8 @@ class CMainWindow : public QMainWindow
 public:
     CPluginManager* GetPluginManager();
 
-	QString GetSDKIncludePath() const;
-	void SetSDKIncludePath(const QString& s);
-
-	QString GetSDKLibraryPath() const;
-	void SetSDKLibraryPath(const QString& s);
+	QString GetSDKPath() const;
+	void SetSDKPath(const QString& s);
 
 	QString GetCreatePluginPath() const;
 	void SetCreatePluginPath(const QString& s);
diff --git a/FEBioStudio/ProjectViewer.cpp b/FEBioStudio/ProjectViewer.cpp
@@ -32,6 +32,7 @@ SOFTWARE.*/
 #include "ModelDocument.h"
 #include "PostDocument.h"
 #include "FEBioStudioProject.h"
+#include <QApplication>
 #include <QTreeWidget>
 #include <QFileSystemModel>
 #include <QBoxLayout>
@@ -917,7 +918,12 @@ CConfigurePluginProcess::CConfigurePluginProcess(QObject* parent) : CPluginProce
 
 void CConfigurePluginProcess::run()
 {
-	start("cmake", QStringList() << "-S" << "." << "-B" << "./build");
+    CMainWindow* wnd = dynamic_cast<CMainWindow*>(QApplication::activeWindow());
+    if (wnd == nullptr) return;
+
+    QString sdkPath = "-DCMAKE_PREFIX_PATH=" + wnd->GetSDKPath();
+
+	start("cmake", QStringList() << "-S" << "." << "-B" << "./build" << sdkPath);
 }
 
 CBuildPluginProcess::CBuildPluginProcess(QObject* parent) : CPluginProcess(parent)
diff --git a/FEBioStudio/plugin_templates.h b/FEBioStudio/plugin_templates.h
@@ -72,20 +72,7 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
 endif()
 
-# Find FEBio Libs
-set(FEBIO_LIBS "")
-set(FEBIO_DEBUG_LIBS "")
-
-foreach(name IN LISTS FEBIO_LIB_NAMES)
-    find_library(TEMP NAMES ${name} PATHS "$(PLUGIN_SDK_LIBS)Release")
-    list(APPEND FEBIO_LIBS ${TEMP})
-    unset(TEMP CACHE)
-
-    find_library(TEMP NAMES ${name} PATHS "$(PLUGIN_SDK_LIBS)Debug")
-    list(APPEND FEBIO_DEBUG_LIBS ${TEMP})
-    unset(TEMP CACHE)
-endforeach(name)
-
+find_package(FEBio REQUIRED)
 
 ##### Set definitions and compile options #####
 if(WIN32)
@@ -102,22 +89,14 @@ else()
     set(CMAKE_BUILD_RPATH $ORIGIN/../lib/)
 endif()
 
-# Set include directory
-include_directories($(PLUGIN_SDK_INCLUDE))
-
 # Add library
 add_library($(PLUGIN_NAME) SHARED $(CLASS_NAME).h $(CLASS_NAME).cpp main.cpp)
 set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT $(PLUGIN_NAME))
 
 # Link FEBio Libraries
-foreach(name IN LISTS FEBIO_LIBS)
-    target_link_libraries($(PLUGIN_NAME) optimized ${name})
-endforeach()
-
-foreach(name IN LISTS FEBIO_DEBUG_LIBS)
-    target_link_libraries($(PLUGIN_NAME) debug ${name})
+foreach(name IN LISTS FEBIO_LIB_NAMES)
+    target_link_libraries($(PLUGIN_NAME) FEBio::${name})
 endforeach()
-
 )delim";
 
 // This defines the main.cpp file, which registers feature classes.
diff --git a/FEBioStudio/ui_createplugin.cpp b/FEBioStudio/ui_createplugin.cpp
@@ -564,13 +564,6 @@ bool GeneratePluginFiles(const PluginConfig& config)
 		}
 		else
 		{
-			// get the SDK paths
-			QString SDKInc = config.sdkInc;
-			QString SDKLib = config.sdkLib;
-			SDKInc.replace("\\", "/");
-			SDKLib.replace("\\", "/");
-			if (SDKLib.last(1) != "/") SDKLib += "/";
-
             QString febioLibs = "";
             for(auto lib : config.febioLibs)
             {
@@ -580,8 +573,6 @@ bool GeneratePluginFiles(const PluginConfig& config)
 			QString cmakeText = cmakecomment + QString(szcmake);
 			cmakeText = cmakeText.replace("$(PLUGIN_NAME)", config.name);
 			cmakeText = cmakeText.replace("$(CLASS_NAME)", config.className);
-			cmakeText = cmakeText.replace("$(PLUGIN_SDK_INCLUDE)", SDKInc);
-			cmakeText = cmakeText.replace("$(PLUGIN_SDK_LIBS)", SDKLib);
             cmakeText = cmakeText.replace("$(FEBIO_LIB_NAMES)", febioLibs);
 			if (!GenerateFile(config.cmakeFile, cmakeText)) return false;
 		}
diff --git a/FEBioStudio/ui_createplugin.h b/FEBioStudio/ui_createplugin.h
@@ -151,8 +151,6 @@ struct PluginConfig
 	QString headerTxt;
 	QString sourceTxt;
 
-	QString sdkInc;
-	QString sdkLib;
     QStringList febioLibs;
 };
 
diff --git a/FEBioStudio/ui_mainwindow.h b/FEBioStudio/ui_mainwindow.h
@@ -233,8 +233,7 @@ struct FBS_SETTINGS
 	bool	loadFEBioConfigFile;	// load the FEBio config file on startup
 	QString	febioConfigFileName;	// the path to the default FEBio config file
 
-	QString FEBioSDKInc;	// path to FEBio SDK includes
-	QString FEBioSDKLib;	// path to FEBio SDK libraries
+    QString FEBioSDKPath;	// path to FEBio SDK
 	QString createPluginPath;	// default path to FEBio plugins
 
 	bool	clearUndoOnSave;	// clear the undo stack on save

Original file line number	Diff line number	Diff line change
`@@ -564,13 +564,6 @@ bool GeneratePluginFiles(const PluginConfig& config)`
`564`	`564`	`}`
`565`	`565`	`else`
`566`	`566`	`{`
`567`		`- // get the SDK paths`
`568`		`- QString SDKInc = config.sdkInc;`
`569`		`- QString SDKLib = config.sdkLib;`
`570`		`- SDKInc.replace("\\", "/");`
`571`		`- SDKLib.replace("\\", "/");`
`572`		`- if (SDKLib.last(1) != "/") SDKLib += "/";`
`573`		`-`
`574`	`567`	`QString febioLibs = "";`
`575`	`568`	`for(auto lib : config.febioLibs)`
`576`	`569`	`{`
`@@ -580,8 +573,6 @@ bool GeneratePluginFiles(const PluginConfig& config)`
`580`	`573`	`QString cmakeText = cmakecomment + QString(szcmake);`
`581`	`574`	`cmakeText = cmakeText.replace("$(PLUGIN_NAME)", config.name);`
`582`	`575`	`cmakeText = cmakeText.replace("$(CLASS_NAME)", config.className);`
`583`		`- cmakeText = cmakeText.replace("$(PLUGIN_SDK_INCLUDE)", SDKInc);`
`584`		`- cmakeText = cmakeText.replace("$(PLUGIN_SDK_LIBS)", SDKLib);`
`585`	`576`	`cmakeText = cmakeText.replace("$(FEBIO_LIB_NAMES)", febioLibs);`
`586`	`577`	`if (!GenerateFile(config.cmakeFile, cmakeText)) return false;`
`587`	`578`	`}`