diff options
| author | Manoj Rajagopalan <manoj@nanorex.com> | 2008-04-10 19:44:00 +0000 |
|---|---|---|
| committer | Manoj Rajagopalan <manoj@nanorex.com> | 2008-04-10 19:44:00 +0000 |
| commit | b421e318f098969f17971524551d87cf4cc32441 (patch) | |
| tree | 5300c98e8766f6a2ecc040dc1024fdaec3cfa958 | |
| parent | 089a047c5f45f307ab08db9eb3144ef8590e7c04 (diff) | |
| download | nanoengineer-theirix-b421e318f098969f17971524551d87cf4cc32441.tar.gz nanoengineer-theirix-b421e318f098969f17971524551d87cf4cc32441.zip | |
Separating debug and release builds for executables and libs
7 files changed, 149 insertions, 74 deletions
diff --git a/cad/plugins/NanoVision-1/src/KDevelop/Testing/CppUnit/CppUnit.pro b/cad/plugins/NanoVision-1/src/KDevelop/Testing/CppUnit/CppUnit.pro index 456e2dcd4..6a2fca8a1 100644 --- a/cad/plugins/NanoVision-1/src/KDevelop/Testing/CppUnit/CppUnit.pro +++ b/cad/plugins/NanoVision-1/src/KDevelop/Testing/CppUnit/CppUnit.pro @@ -1,3 +1,16 @@ +TEMPLATE = app +TARGET = CppUnit +DESTDIR = ../../../../bin/ + +CONFIG += stl \ + debug_and_release \ + build_all + +CONFIG(debug,debug|release) { + TARGET = $$join(TARGET,,,_d) +} + + SOURCES += ../../../Testing/CppUnit/CppUnit.cpp \ ../../../Interface/NXEntityManagerTest.cpp \ ../../../Interface/NXNumbersTest.cpp \ @@ -12,10 +25,6 @@ SOURCES += ../../../Testing/CppUnit/CppUnit.cpp \ ../../../Plugins/NanorexMMPImportExport/NanorexMMPImportExportTest.cpp \ ../../../Plugins/NanorexMMPImportExport/NanorexMMPImportExportRagelTest.cpp -TEMPLATE = app - -TARGET = CppUnit - INCLUDEPATH += ../../../../include \ $(OPENBABEL_INCPATH) \ @@ -24,6 +33,7 @@ INCLUDEPATH += ../../../../include \ # The "../../../src" is temporary for NXEntityManager to access an # HDF5_SimResultsImportExport plugin function directly. + HEADERS += ../../../Utility/NXCommandResultTest.h \ ../../../Utility/NXLoggerTest.h \ ../../../Utility/NXStringTokenizerTest.h \ @@ -39,11 +49,6 @@ HEADERS += ../../../Utility/NXCommandResultTest.h \ macx : TARGETDEPS ~= s/.so/.dylib/g win32 : TARGETDEPS ~= s/.so/.a/g -DESTDIR = ../../../../bin - -CONFIG += stl \ - debug_and_release - # This tell qmake to not create a Mac bundle for this application. CONFIG -= app_bundle @@ -66,15 +71,18 @@ DISTFILES += ../../../Plugins/NanorexMMPImportExport/molecule.rl \ ../../../Plugins/NanorexMMPImportExport/group.rl \ ../../../Plugins/NanorexMMPImportExport/NanorexMMPImportExportRagelTest.rl +PROJECTLIBS = -lNanorexMMPImportExport \ + -lNanorexUtility \ + -lNanorexInterface - +CONFIG(debug,debug|release): PROJECTLIBS ~= s/(.+)/\1_d/g LIBS += -L../../../../lib \ - -lNanorexInterface \ - -lNanorexUtility \ - -lNanorexMMPImportExport \ + $$PROJECTLIBS \ -L$(OPENBABEL_LIBPATH) \ -L$(HDF5_SIMRESULTS_INCPATH) \ -lcppunit \ -lopenbabel +# make clean target +QMAKE_CLEAN += $${DESTDIR}$${TARGET} diff --git a/cad/plugins/NanoVision-1/src/KDevelop/Testing/HDF5_Consumer/HDF5_Consumer.pro b/cad/plugins/NanoVision-1/src/KDevelop/Testing/HDF5_Consumer/HDF5_Consumer.pro index 58bc6d594..c60aa12c6 100644 --- a/cad/plugins/NanoVision-1/src/KDevelop/Testing/HDF5_Consumer/HDF5_Consumer.pro +++ b/cad/plugins/NanoVision-1/src/KDevelop/Testing/HDF5_Consumer/HDF5_Consumer.pro @@ -1,6 +1,11 @@ -SOURCES += ../../../Testing/HDF5_Consumer/HDF5_Consumer.cpp - TEMPLATE = app +TARGET = HDF5_Consumer +DESTDIR = ../../../../bin/ + +CONFIG += debug_and_release \ +build_all + +SOURCES += ../../../Testing/HDF5_Consumer/HDF5_Consumer.cpp INCLUDEPATH += $(OPENBABEL_INCPATH) \ ../../../../include \ @@ -8,10 +13,17 @@ INCLUDEPATH += $(OPENBABEL_INCPATH) \ # The "../../../src" is temporary for NXEntityManager to access an # HDF5_SimResultsImportExport plugin function directly. +PROJECTLIBS = -lNanorexInterface \ +-lNanorexUtility + +CONFIG(debug,debug|release) { + TARGET = $${TARGET}_d + PROJECTLIBS ~= s/(.+)/\1_d/g +} + LIBS += -L$(OPENBABEL_LIBPATH) \ -L../../../../lib \ --lNanorexInterface \ --lNanorexUtility \ +$$PROJECTLIBS \ -lopenbabel TARGETDEPS += ../../../../lib/libNanorexInterface.so \ @@ -19,10 +31,10 @@ TARGETDEPS += ../../../../lib/libNanorexInterface.so \ macx : TARGETDEPS ~= s/.so/.dylib/g win32 : TARGETDEPS ~= s/.so/.a/g -DESTDIR = ../../../../bin/ - HEADERS += ../../../Testing/HDF5_Consumer/HDF5_Consumer.h # This tell qmake to not create a Mac bundle for this application. CONFIG -= app_bundle +# make clean target +QMAKE_CLEAN += $${DESTDIR}$${TARGET} diff --git a/cad/plugins/NanoVision-1/src/KDevelop/Testing/Plugins/MMPOpenGLRendererTest/MMPOpenGLRendererTest.pro b/cad/plugins/NanoVision-1/src/KDevelop/Testing/Plugins/MMPOpenGLRendererTest/MMPOpenGLRendererTest.pro index a850d81d0..a19de0691 100644 --- a/cad/plugins/NanoVision-1/src/KDevelop/Testing/Plugins/MMPOpenGLRendererTest/MMPOpenGLRendererTest.pro +++ b/cad/plugins/NanoVision-1/src/KDevelop/Testing/Plugins/MMPOpenGLRendererTest/MMPOpenGLRendererTest.pro @@ -1,16 +1,17 @@ -SOURCES += ../../../../Plugins/NanorexMMPImportExport/MMPOpenGLRendererTest.cpp - TEMPLATE = app +TARGET = MMPOpenGLRendererTest +DESTDIR = ../../../../../bin/ -CONFIG -= release -CONFIG += debug \ +CONFIG += debug_and_release \ stl \ rtti \ -opengl +opengl \ +build_all + QT += opengl -DESTDIR = ../../../../../bin/ +CONFIG(debug,debug|release) : TARGET = $${TARGET}_d QMAKE_CXXFLAGS_DEBUG += -DNX_DEBUG \ -g \ @@ -23,13 +24,31 @@ INCLUDEPATH += ../../../../../src/Plugins/RenderingEngines/OpenGL \ ../../../../../src \ ../../../../../include -LIBS += -L../../../../../lib \ - -lNXBallAndStickOpenGLRenderer \ - -lNXOpenGLRenderingEngine \ - -lNanorexMMPImportExport \ +SOURCES += ../../../../Plugins/NanorexMMPImportExport/MMPOpenGLRendererTest.cpp + +PROJECTLIBS = -lNanorexUtility \ -lNanorexInterface \ - -lNanorexUtility \ + -lNanorexMMPImportExport \ + -lNXOpenGLRenderingEngine \ + -lNXBallAndStickOpenGLRenderer + +CONFIG(debug,debug|release) : PROJECTLIBS ~= s/(.+)/\1_d/g + +LIBS += -L../../../../../lib \ + $$PROJECTLIBS \ + -L$(OPENBABEL_LIBPATH) \ -lopenbabel -TARGETDEPS += ../../../../../lib/libNXBallAndStickOpenGLRenderer.so +TARGETDEPS += ../../../../../lib/libNXBallAndStickOpenGLRenderer.so \ + ../../../../../lib/libNXOpenGLRenderingEngine.so \ + ../../../../../lib/libNXOpenGLSceneGraph.a \ + ../../../../../lib/libGLT.a \ + ../../../../../lib/libNanorexMMPImportExport.so \ + ../../../../../lib/libNanorexInterface.so \ + ../../../../../lib/libNanorexUtility.so + +macx: TARGETDEPS ~= s/.so/.dylib/g +win32: TARGETDEPS ~= s/.so/.dll/g +# make clean targets +QMAKE_CLEAN += $${DESTDIR}$${TARGET} diff --git a/cad/plugins/NanoVision-1/src/KDevelop/Testing/Plugins/RenderingEngines/OpenGL/NXOpenGLRenderingEngineTest/NXOpenGLRenderingEngineTest.pro b/cad/plugins/NanoVision-1/src/KDevelop/Testing/Plugins/RenderingEngines/OpenGL/NXOpenGLRenderingEngineTest/NXOpenGLRenderingEngineTest.pro index 3d3540efd..4742bf555 100644 --- a/cad/plugins/NanoVision-1/src/KDevelop/Testing/Plugins/RenderingEngines/OpenGL/NXOpenGLRenderingEngineTest/NXOpenGLRenderingEngineTest.pro +++ b/cad/plugins/NanoVision-1/src/KDevelop/Testing/Plugins/RenderingEngines/OpenGL/NXOpenGLRenderingEngineTest/NXOpenGLRenderingEngineTest.pro @@ -1,24 +1,28 @@ TEMPLATE = app +TARGET = NXOpenGLRenderingEngineTest +DESTDIR = ../../../../../../../bin/ CONFIG += stl \ opengl \ debug_and_release \ - rtti + rtti \ + build_all + QT += opengl QMAKE_CXXFLAGS_DEBUG += -DNX_DEBUG \ -g \ -O0 \ -fno-inline + INCLUDEPATH += ../../../../../../../include \ ../../../../../../../src/Plugins/RenderingEngines/OpenGL/GLT \ $(OPENBABEL_INCPATH) \ ../../../../../../../src \ ../../../../../../../src/Plugins/RenderingEngines/OpenGL -SOURCES += ../../../../../../Plugins/RenderingEngines/OpenGL/NXOpenGLRenderingEngineTest.cpp +SOURCES += ../../../../../../Plugins/RenderingEngines/OpenGL/NXOpenGLRenderingEngineTest.cpp -DESTDIR = ../../../../../../../bin TARGETDEPS += ../../../../../../../lib/libNXBallAndStickOpenGLRenderer.so \ ../../../../../../../lib/libNXOpenGLRenderingEngine.so \ @@ -27,15 +31,25 @@ TARGETDEPS += ../../../../../../../lib/libNXBallAndStickOpenGLRenderer.so \ ../../../../../../../lib/libNanorexInterface.so \ ../../../../../../../lib/libNanorexUtility.so +macx: TARGETDEPS ~= s/.so/.dylib/g - - -LIBS += -L../../../../../../../lib \ - -lNXBallAndStickOpenGLRenderer \ +PROJECTLIBS = -lNXBallAndStickOpenGLRenderer \ -lNXOpenGLRenderingEngine \ -lNanorexInterface \ -lNanorexUtility \ -lNXOpenGLSceneGraph \ - -lGLT \ + -lGLT + +CONFIG(debug,debug|release) { + TARGET = $${TARGET}_d + PROJECTLIBS ~= s/(.+)/\1_d/g +} + +LIBS += -L../../../../../../../lib \ + $$PROJECTLIBS \ + -L$(OPENBABEL_INCPATH) \ -lopenbabel +# make clean target +QMAKE_CLEAN += $${DESTDIR}$${TARGET} + diff --git a/cad/plugins/NanoVision-1/src/KDevelop/Testing/Plugins/RenderingEngines/OpenGL/Renderers/NXBallAndStickOpenGLRendererTest/NXBallAndStickOpenGLRendererTest.pro b/cad/plugins/NanoVision-1/src/KDevelop/Testing/Plugins/RenderingEngines/OpenGL/Renderers/NXBallAndStickOpenGLRendererTest/NXBallAndStickOpenGLRendererTest.pro index b03bde749..0eb77f34a 100644 --- a/cad/plugins/NanoVision-1/src/KDevelop/Testing/Plugins/RenderingEngines/OpenGL/Renderers/NXBallAndStickOpenGLRendererTest/NXBallAndStickOpenGLRendererTest.pro +++ b/cad/plugins/NanoVision-1/src/KDevelop/Testing/Plugins/RenderingEngines/OpenGL/Renderers/NXBallAndStickOpenGLRendererTest/NXBallAndStickOpenGLRendererTest.pro @@ -5,6 +5,10 @@ CONFIG += stl \ opengl \ debug_and_release +CONFIG(debug,debug|release) { + TARGET = $$join(TARGET,,,_d) +} + QT += opengl diff --git a/cad/plugins/NanoVision-1/src/KDevelop/Testing/Plugins/RenderingEngines/OpenGL/TrajectoryGraphicsWindowTest/TrajectoryGraphicsWindowTest.pro b/cad/plugins/NanoVision-1/src/KDevelop/Testing/Plugins/RenderingEngines/OpenGL/TrajectoryGraphicsWindowTest/TrajectoryGraphicsWindowTest.pro index 72ae087c2..9711a82ff 100644 --- a/cad/plugins/NanoVision-1/src/KDevelop/Testing/Plugins/RenderingEngines/OpenGL/TrajectoryGraphicsWindowTest/TrajectoryGraphicsWindowTest.pro +++ b/cad/plugins/NanoVision-1/src/KDevelop/Testing/Plugins/RenderingEngines/OpenGL/TrajectoryGraphicsWindowTest/TrajectoryGraphicsWindowTest.pro @@ -1,24 +1,26 @@ -SOURCES += ../../../../../../Testing/OpenGL/TrajectoryGraphicsWindowTest.cpp \ - ../../../../../../Testing/OpenGL/TrajectoryTestGraphicsManager.cpp \ - ../../../../../../TrajectoryGraphicsWindow.cpp \ - ../../../../../../DataWindow.cpp - TEMPLATE = app +TARGET = TrajectoryGraphicsWindowTest +DESTDIR = ../../../../../../../bin/ + -CONFIG += debug_and_release \ -stl \ +CONFIG += stl \ rtti \ -opengl -QT += opengl +opengl \ +debug_and_release \ +build_all -DESTDIR = ../../../../../../../bin/ +CONFIG(debug,debug|release) : TARGET = $${TARGET}_d -QMAKE_CXXFLAGS_DEBUG += -DNX_DEBUG \ - -g \ - -O0 \ - -fno-inline +QT += opengl +HEADERS += ../../../../../../Testing/OpenGL/TrajectoryTestGraphicsManager.h \ +../../../../../../TrajectoryGraphicsWindow.h \ +../../../../../../DataWindow.h +SOURCES += ../../../../../../Testing/OpenGL/TrajectoryGraphicsWindowTest.cpp \ + ../../../../../../Testing/OpenGL/TrajectoryTestGraphicsManager.cpp \ + ../../../../../../TrajectoryGraphicsWindow.cpp \ + ../../../../../../DataWindow.cpp TARGETDEPS += ../../../../../../../lib/libNXBallAndStickOpenGLRenderer.so \ ../../../../../../../lib/libNXOpenGLRenderingEngine.so \ @@ -27,24 +29,35 @@ TARGETDEPS += ../../../../../../../lib/libNXBallAndStickOpenGLRenderer.so \ ../../../../../../../lib/libNanorexInterface.so \ ../../../../../../../lib/libNanorexUtility.so -HEADERS += ../../../../../../Testing/OpenGL/TrajectoryTestGraphicsManager.h \ -../../../../../../TrajectoryGraphicsWindow.h \ -../../../../../../DataWindow.h INCLUDEPATH += ../../../../../Plugins/RenderingEngines/OpenGL/Renderers/NXBallAndStickOpenGLRenderer \ ../../../../../Plugins/RenderingEngines/OpenGL/NXOpenGLRenderingEngine \ ../../../../../../../src/ \ ../../../../../../../include/ \ $(OPENBABEL_INCPATH) + +FORMS += ../../../../../../TrajectoryGraphicsWindow.ui + +PROJECTLIBS = -lNanorexInterface \ +-lNanorexUtility \ +-lGLT \ +-lNXOpenGLSceneGraph \ +-lNXOpenGLRenderingEngine \ +-lNXBallAndStickOpenGLRenderer + +CONFIG(debug,debug|release): PROJECTLIBS ~= s/(.+)/\1_d/g + LIBS += -L../../../../../../../lib \ - -lNXBallAndStickOpenGLRenderer \ - -lNXOpenGLRenderingEngine \ - ../../../../../../../lib/libNXOpenGLSceneGraph.a \ - ../../../../../../../lib/libGLT.a \ - -lNanorexUtility \ - -lNanorexInterface \ + $$PROJECTLIBS \ -L$(OPENBABEL_LIBPATH) \ -lopenbabel -FORMS += ../../../../../../TrajectoryGraphicsWindow.ui +QMAKE_CXXFLAGS_DEBUG += -DNX_DEBUG \ + -g \ + -O0 \ + -fno-inline + +# make 'clean' target +QMAKE_CLEAN += $${DESTDIR}$${TARGET} + diff --git a/cad/plugins/NanoVision-1/src/KDevelop/Testing/QTestLib/QTestLib.pro b/cad/plugins/NanoVision-1/src/KDevelop/Testing/QTestLib/QTestLib.pro index 8b2174013..140dfc469 100644 --- a/cad/plugins/NanoVision-1/src/KDevelop/Testing/QTestLib/QTestLib.pro +++ b/cad/plugins/NanoVision-1/src/KDevelop/Testing/QTestLib/QTestLib.pro @@ -1,11 +1,23 @@ TEMPLATE = app +TARGET = NXGraphicsManagerTest +DESTDIR = ../../../../bin/ CONFIG += debug_and_release \ qtestlib \ exceptions \ stl \ rtti \ -opengl +opengl \ +build_all + +QT += opengl + +PROJECTLIBS = -lNanorexInterface -lNanorexUtility + +CONFIG(debug,debug|release) { + TARGET = $${TARGET}_d + PROJECTLIBS ~= s/(.+)/\1_d/g +} SOURCES += ../../../Interface/NXGraphicsManagerTest.cpp @@ -14,15 +26,8 @@ HEADERS += ../../../Interface/NXGraphicsManagerTest.h INCLUDEPATH += $(OPENBABEL_INCPATH) \ ../../../../include -QT += opengl - -DESTDIR = ../../../../bin - - - -TARGET = NXGraphicsManagerTest - LIBS += -L../../../../lib \ - -lNanorexInterface \ - -lNanorexUtility + $$PROJECTLIBS +# make clean targets +QMAKE_CLEAN += $${DESTDIR}$${TARGET} |