[Scidavis-svn-log] SF.net SVN: scidavis:[1459] branches/development

[<hp...@us...>]

Revision: 1459
          http://sourceforge.net/p/scidavis/svn/1459
Author:   hpcoder
Date:     2014-10-27 00:06:30 +0000 (Mon, 27 Oct 2014)
Log Message:
-----------
Created a qmake configuration file for the liborigin vendor branch.

Modified Paths:
--------------
    branches/development/3rdparty/liborigin/liborigin.pro
    branches/development/scidavis.pro

Modified: branches/development/3rdparty/liborigin/liborigin.pro
===================================================================
--- branches/development/3rdparty/liborigin/liborigin.pro	2014-10-03 13:33:46 UTC (rev 1458)
+++ branches/development/3rdparty/liborigin/liborigin.pro	2014-10-27 00:06:30 UTC (rev 1459)
@@ -1,3 +1,27 @@
-# this file is not part of the liborigin library, but purely to allow
-# the build to be integrated with scidavis's build
+# this file is not part of the liborigin library, which uses the cmake
+# system, but must be maintained separately of liborigin
 
+TEMPLATE = lib
+CONFIG += staticlib
+TARGET = origin
+# following define required to prevent the catastrophic logging when
+# large files are imported
+DEFINE += NO_CODE_GENERATION_FOR_LOG
+
+HEADERS  += \
+        config.h \
+	OriginObj.h\
+	OriginFile.h\
+	OriginParser.h\
+	tree.hh
+
+SOURCES += \
+	OriginFile.cpp\
+	OriginParser.cpp\
+	OriginDefaultParser.cpp\
+	Origin600Parser.cpp\
+	Origin610Parser.cpp\
+	Origin700Parser.cpp\
+	Origin750Parser.cpp\
+	Origin800Parser.cpp\
+	Origin810Parser.cpp

Modified: branches/development/scidavis.pro
===================================================================
--- branches/development/scidavis.pro	2014-10-03 13:33:46 UTC (rev 1458)
+++ branches/development/scidavis.pro	2014-10-27 00:06:30 UTC (rev 1459)
@@ -10,14 +10,6 @@
 SUBDIRS = 3rdparty/liborigin scidavis test
 CONFIG+=ordered
 
-# Overwrite the qmake generated Makefile by the cmake one
-mxe {
-# urrgh! - maybe adding a qmake.pro file for liborigin might be better...
-  system("cd 3rdparty/liborigin; rm CMakeCache.txt; cmake  -DCMAKE_TOOLCHAIN_FILE=/scratch/rks/github/mxe/usr/i686-pc-mingw32.static/share/cmake/mxe-conf.cmake  -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_CXX_FLAGS:STRING=-DNO_CODE_GENERATION_FOR_LOG .")
-} else {
-  system("cd 3rdparty/liborigin; rm CMakeCache.txt; cmake -DBUILD_SHARED_LIBS:BOOL=OFF -DCMAKE_CXX_FLAGS:STRING=-DNO_CODE_GENERATION_FOR_LOG .")
-}
-
 !mxe {
 # optional fit plugins
 SUBDIRS += fitPlugins/fitRational0\

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.