Remove WITH_SPICE CMake switch

ra3xdh · Oct 20, 2017 · 9a1a7b1 · 9a1a7b1
1 parent c16dce9
commit 9a1a7b1
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 53 deletions.
diff --git a/qucs-activefilter/CMakeLists.txt b/qucs-activefilter/CMakeLists.txt
@@ -2,12 +2,7 @@ PROJECT(qucsactivefilter CXX C)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 cmake_policy(VERSION 2.6)
 
-IF(WITH_SPICE)
-MESSAGE("SPICE support enabled")
 SET(QUCS_NAME "qucs-s")
-ELSE()
-SET(QUCS_NAME "qucs")
-ENDIF()
 
 # use top VERSION file
 file (STRINGS ${PROJECT_SOURCE_DIR}/../VERSION QUCS_VERSION)

diff --git a/qucs-filter/CMakeLists.txt b/qucs-filter/CMakeLists.txt
@@ -2,12 +2,7 @@ PROJECT(qucsfilter CXX C)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 cmake_policy(VERSION 2.6)
 
-IF(WITH_SPICE)
-MESSAGE("SPICE support enabled")
 SET(QUCS_NAME "qucs-s")
-ELSE()
-SET(QUCS_NAME "qucs")
-ENDIF()
 
 # use top VERSION file
 file (STRINGS ${PROJECT_SOURCE_DIR}/../VERSION QUCS_VERSION)

diff --git a/qucs-lib/CMakeLists.txt b/qucs-lib/CMakeLists.txt
@@ -2,12 +2,7 @@ PROJECT(qucslib CXX C)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 cmake_policy(VERSION 2.6)
 
-IF(WITH_SPICE)
-MESSAGE("SPICE support enabled")
 SET(QUCS_NAME "qucs-s")
-ELSE()
-SET(QUCS_NAME "qucs")
-ENDIF()
 
 # use top VERSION file
 file (STRINGS ${PROJECT_SOURCE_DIR}/../VERSION QUCS_VERSION)

diff --git a/qucs/CMakeLists.txt b/qucs/CMakeLists.txt
@@ -9,16 +9,11 @@
 #
 # By default, the prefix is "/usr/local"
 
-PROJECT(qucs CXX)
+PROJECT(qucs-s CXX)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 cmake_policy(VERSION 2.6)
 
-IF(WITH_SPICE)
-MESSAGE("SPICE support enabled")
-SET(QUCS_NAME "${PROJECT_NAME}-s")
-ELSE()
 SET(QUCS_NAME "${PROJECT_NAME}")
-ENDIF()
 
 # use top VERSION file
 file (STRINGS ${PROJECT_SOURCE_DIR}/../VERSION QUCS_VERSION)

diff --git a/qucs/components/CMakeLists.txt b/qucs/components/CMakeLists.txt
@@ -56,10 +56,9 @@ dcfeed.cpp		logical_and.cpp		pm_modulator.cpp
 vcresistor.cpp
 vacomponent.cpp
 mutualx.cpp
-)
 
-IF(WITH_SPICE)
-SET(COMPONENTS_SRCS ${COMPONENTS_SRCS}
+# SPICE devices
+
 bsim3v34nMOS.cpp
 bsim3v34pMOS.cpp
 bsim4v30nMOS.cpp
@@ -75,7 +74,6 @@ hicumL2V2p24.cpp
 hicumL2V2p31n.cpp
 HBT_X.cpp
 )
-ENDIF()
 
 SET(COMPONENTS_HDRS
 ac_sim.h
@@ -240,10 +238,9 @@ volt_noise.h
 vprobe.h
 vpulse.h
 vrect.h
-)
 
-IF(WITH_SPICE)
-SET(COMPONENTS_HDRS ${COMPONENTS_HDRS}
+# SPICE devices
+
 bsim3v34nMOS.h
 bsim3v34pMOS.h
 bsim4v30nMOS.h
@@ -259,7 +256,7 @@ hicumL2V2p24.h
 hicumL2V2p31n.h
 HBT_X.h
 )
-ENDIF()
+
 
 
 SET(COMPONENTS_MOC_HDRS

diff --git a/qucs/main.cpp b/qucs/main.cpp
@@ -790,11 +790,7 @@ int main(int argc, char *argv[])
   // continue to set up overrides or default settings (some are saved on exit)
 
   // check for relocation env variable
-#ifdef WITH_SPICE
   char *var = NULL; // Don't use QUCSDIR with Qucs-S
-#else
-  char* var = getenv("QUCSDIR");
-#endif
   QDir QucsDir;
   if (var!= NULL)
   {

diff --git a/qucs/module.cpp b/qucs/module.cpp
@@ -424,7 +424,6 @@ void Module::registerModules (void) {
       REGISTER_VERILOGA_1 (phototransistor);
       REGISTER_VERILOGA_1 (nigbt);
       REGISTER_VERILOGA_1 (vcresistor);
-#ifdef WITH_SPICE
       REGISTER_VERILOGA_1 (bsim3v34nMOS);
       REGISTER_VERILOGA_1 (bsim3v34pMOS);
       REGISTER_VERILOGA_1 (bsim4v30nMOS);
@@ -436,7 +435,6 @@ void Module::registerModules (void) {
       REGISTER_VERILOGA_1 (hicumL2V2p24);
       REGISTER_VERILOGA_1 (hicumL2V2p31n);
       REGISTER_VERILOGA_1 (HBT_X);
-#endif
 
       // digital components
       REGISTER_DIGITAL_1 (Digi_Source);

diff --git a/qucs/qucs.h b/qucs/qucs.h
@@ -310,9 +310,7 @@ private slots:
           *createLib, *importData, *graph2csv, *createPkg, *extractPkg,
           *callAtt, *callRes, *centerHor, *centerVert, *loadModule, *buildModule;
 
-#ifdef WITH_SPICE
   QAction *helpQucsIndex;
-#endif
   QAction *simSettings;
   QAction *buildVAModule, *buildIFS;
 
@@ -361,9 +359,7 @@ public slots:
   void slotCallAtt();
   void slotCallRes();
   void slotHelpIndex();       // shows a HTML docu: Help Index
-#ifdef WITH_SPICE
   void slotHelpQucsIndex();
-#endif
   void slotGettingStarted();  // shows a HTML docu: Getting started
   void slotChangeProps();
   void slotAddToProject();

diff --git a/qucs/qucs_actions.cpp b/qucs/qucs_actions.cpp
@@ -843,28 +843,18 @@ void QucsApp::launchTool(const QString& prog, const QString& progDesc, const QSt
 // --------------------------------------------------------------
 void QucsApp::slotHelpIndex()
 {
-#ifndef WITH_SPICE
-  showHTML("index.html");
-#else
   QDesktopServices::openUrl(QUrl("https://qucs-help.readthedocs.org/en/spice4qucs/"));
-#endif
 }
 
-#ifdef WITH_SPICE
 void QucsApp::slotHelpQucsIndex()
 {
     QDesktopServices::openUrl(QUrl("https://qucs-help.readthedocs.io/"));
 }
-#endif
 
 // --------------------------------------------------------------
 void QucsApp::slotGettingStarted()
 {
-#ifndef WITH_SPICE
-  showHTML("start.html");
-#else
   QDesktopServices::openUrl(QUrl("https://qucs-help.readthedocs.io/en/0.0.18/start.html"));
-#endif
 }
 
 // --------------------------------------------------------------

diff --git a/qucs/qucs_init.cpp b/qucs/qucs_init.cpp
@@ -651,12 +651,10 @@ void QucsApp::initActions()
   helpIndex->setWhatsThis(tr("Help Index\n\nIndex of intern Qucs help"));
   connect(helpIndex, SIGNAL(triggered()), SLOT(slotHelpIndex()));
 
-#ifdef WITH_SPICE
   helpQucsIndex = new QAction(tr("Help Index (basic Qucs version)"), this);
   helpQucsIndex->setStatusTip(tr("Index of basic Qucs Help"));
   helpQucsIndex->setWhatsThis(tr("Help Index\n\nIndex of basic Qucs help"));
   connect(helpQucsIndex, SIGNAL(triggered()), SLOT(slotHelpQucsIndex()));
-#endif
 
   helpGetStart = new QAction(tr("Getting Started..."), this);
   helpGetStart->setStatusTip(tr("Getting Started with Qucs"));
@@ -825,9 +823,7 @@ void QucsApp::initMenuBar()
 
   helpMenu = new QMenu(tr("&Help"));  // menuBar entry helpMenu
   helpMenu->addAction(helpIndex);
-#ifdef WITH_SPICE
   helpMenu->addAction(helpQucsIndex);
-#endif
   helpMenu->addAction(helpGetStart);
   helpMenu->insertSeparator();