SIM/qucs_s
1
0
Fork 0
mirror of https://github.com/ra3xdh/qucs_s synced 2025-03-28 21:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Further remove WITH_SPICE...

Browse Source
This commit is contained in:
Vadim Kuznetzov 2017-10-20 18:23:21 +03:00
parent 9085dd438b
commit a62186403b
10 changed files with 17 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -2,12 +2,7 @@ PROJECT(qucs-suite CXX)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
cmake_policy(VERSION 2.8)
IF(WITH_SPICE)
MESSAGE("SPICE support enabled")
SET(QUCS_NAME "qucs-s")
ELSE()
SET(QUCS_NAME "qucs")
ENDIF()
file (STRINGS "${qucs-suite_SOURCE_DIR}/VERSION" QUCS_VERSION)
message(STATUS "Configuring Qucs: VERSION ${QUCS_VERSION}")
@ -45,15 +40,6 @@ INCLUDE( ${QT_USE_FILE} )
ADD_DEFINITIONS(${QT_DEFINITIONS})
IF(NOT WITH_SPICE)
ADD_SUBDIRECTORY( qucs-attenuator )
ADD_SUBDIRECTORY( qucs-edit )
ADD_SUBDIRECTORY( qucs-help )
ADD_SUBDIRECTORY( qucs-transcalc )
ADD_SUBDIRECTORY( qucs-rescodes )
ADD_SUBDIRECTORY( contrib )
ENDIF()
ADD_SUBDIRECTORY( qucs )
ADD_SUBDIRECTORY( qucs-activefilter )
#ADD_SUBDIRECTORY( qucs-doc )

2
README.md
View File

@ -12,7 +12,7 @@ Use CMake to build Qucs-S. Install all necessary dependecies: GCC, Qt, and SPICE
~~~
mkdir builddir
cd builddir
cmake .. -DWITH_SPICE=ON -DCMAKE_INSTALL_PREFIX=/your_install_prefix/
cmake .. -DCMAKE_INSTALL_PREFIX=/your_install_prefix/
make
make install
~~~

5
qucs-activefilter/CMakeLists.txt
View File

@ -97,8 +97,3 @@ INSTALL(TARGETS ${QUCS_NAME}activefilter
RUNTIME DESTINATION bin COMPONENT Runtime
)
# man pages
IF(NOT WITH_SPICE)
INSTALL( FILES qucsactivefilter.1 DESTINATION share/man/man1 )
ENDIF()

21
qucs-activefilter/main.cpp
View File

@ -73,27 +73,16 @@ int main(int argc, char *argv[])
QucsSettings.showConsole = true;
// is application relocated?
#ifdef WITH_SPICE
char *var = NULL; // Don't use QUCSDIR with Qucs-S
#else
char* var = getenv("QUCSDIR");
#endif
QDir QucsDir;
if (var != NULL) {
QucsDir = QDir (var);
QString QucsDirStr = QucsDir.canonicalPath ();
LangDir =
QDir::convertSeparators (QucsDirStr + "/share/" QUCS_NAME "/lang/");
} else {
QString QucsApplicationPath = QCoreApplication::applicationDirPath();
QString QucsApplicationPath = QCoreApplication::applicationDirPath();
#ifdef __APPLE__
QucsDir = QDir(QucsApplicationPath.section("/bin",0,0));
QucsDir = QDir(QucsApplicationPath.section("/bin",0,0));
#else
QucsDir = QDir(QucsApplicationPath);
QucsDir.cdUp();
QucsDir = QDir(QucsApplicationPath);
QucsDir.cdUp();
#endif
LangDir = QucsDir.canonicalPath() + "/share/qucs/lang/";
}
LangDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/lang/";
loadSettings();

4
qucs-filter/CMakeLists.txt
View File

@ -118,7 +118,3 @@ INSTALL(TARGETS ${QUCS_NAME}filter
RUNTIME DESTINATION bin COMPONENT Runtime
)
# man pages
IF(NOT WITH_SPICE)
INSTALL( FILES qucsfilter.1 DESTINATION share/man/man1 )
ENDIF()

22
qucs-filter/main.cpp
View File

@ -85,27 +85,15 @@ int main(int argc, char *argv[])
QucsSettings.font = QFont("Helvetica", 12);
// is application relocated?
#ifdef WITH_SPICE
char *var = NULL; // Don't use QUCSDIR with Qucs-S
#else
char* var = getenv("QUCSDIR");
#endif
QDir QucsDir;
if (var != NULL) {
QucsDir = QDir (var);
QString QucsDirStr = QucsDir.canonicalPath ();
QucsSettings.LangDir =
QDir::convertSeparators (QucsDirStr + "/share/" QUCS_NAME "/lang/");
} else {
QString QucsApplicationPath = QCoreApplication::applicationDirPath();
QString QucsApplicationPath = QCoreApplication::applicationDirPath();
#ifdef __APPLE__
QucsDir = QDir(QucsApplicationPath.section("/bin",0,0));
QucsDir = QDir(QucsApplicationPath.section("/bin",0,0));
#else
QucsDir = QDir(QucsApplicationPath);
QucsDir.cdUp();
QucsDir = QDir(QucsApplicationPath);
QucsDir.cdUp();
#endif
QucsSettings.LangDir = QucsDir.canonicalPath() + "/share/qucs/lang/";
}
QucsSettings.LangDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/lang/";
loadSettings();

4
qucs-lib/CMakeLists.txt
View File

@ -87,8 +87,4 @@ INSTALL(TARGETS ${QUCS_NAME}lib
ADD_SUBDIRECTORY( library )
# man pages
IF(NOT WITH_SPICE)
INSTALL( FILES qucslib.1 DESTINATION share/man/man1 )
ENDIF()

23
qucs-lib/main.cpp
View File

@ -99,27 +99,16 @@ int main(int argc, char *argv[])
QucsSettings.QucsHomeDir.setPath(QDir::homePath() + "/.qucs");
// is application relocated?
#ifdef WITH_SPICE
char *var = NULL; // Don't use QUCSDIR with Qucs-S
#else
char* var = getenv("QUCSDIR");
#endif
QDir QucsDir;
if (var != NULL) {
QucsDir = QDir(QString(var));
QucsSettings.LangDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/lang/";
QucsSettings.LibDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/library/";
} else {
QString QucsApplicationPath = QCoreApplication::applicationDirPath();
QString QucsApplicationPath = QCoreApplication::applicationDirPath();
#ifdef __APPLE__
QucsDir = QDir(QucsApplicationPath.section("/bin",0,0));
QucsDir = QDir(QucsApplicationPath.section("/bin",0,0));
#else
QucsDir = QDir(QucsApplicationPath);
QucsDir.cdUp();
QucsDir = QDir(QucsApplicationPath);
QucsDir.cdUp();
#endif
QucsSettings.LangDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/lang/";
QucsSettings.LibDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/library/";
}
QucsSettings.LangDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/lang/";
QucsSettings.LibDir = QucsDir.canonicalPath() + "/share/" QUCS_NAME "/library/";
loadSettings();

10
qucs/CMakeLists.txt
View File

@ -316,19 +316,9 @@ INSTALL(CODE "
" COMPONENT Runtime)
ENDIF()
IF(NOT WITH_SPICE)
# Install wrapper scripts
IF(WIN32)
# SET(SCRIPTS qucsdigi.bat qucsveri.bat qucsdigilib.bat)
ELSE()
# SET(SCRIPTS qucsdigi qucsveri qucsdigilib)
ENDIF()
INSTALL( FILES ${SCRIPTS} DESTINATION bin/ )
ENDIF()
IF(WITH_SPICE)
INSTALL( FILES ${QUCS_NAME}.1 DESTINATION share/man/man1 )
ENDIF()
# To Create a package, one can run "cpack -G DragNDrop CPackConfig.cmake" on Mac OS X
# where CPackConfig.cmake is created by including CPack

2
qucs/components/components.h
View File

@ -189,7 +189,6 @@
// Verilog-A dynamicaly loaded component
#include "vacomponent.h"
#ifdef WITH_SPICE
#include "bsim3v34nMOS.h"
#include "bsim3v34pMOS.h"
#include "bsim4v30nMOS.h"
@ -204,6 +203,5 @@
#include "hicumL2V2p24.h"
#include "hicumL2V2p31n.h"
#include "HBT_X.h"
#endif
#endif