[cig-commits] commit: Added call to *register_static* functions for the test binary (FOR STATIC LIBS).

[Mercurial]

changeset:   371:b98f62dd9e9e
branch:      pcu_rejig
parent:      369:4c94cccc15be
user:        JericoRevote
date:        Tue Dec 22 12:14:12 2009 +1100
files:       SConscript
description:
Added call to *register_static* functions for the test binary (FOR STATIC LIBS).


diff -r 4c94cccc15be -r b98f62dd9e9e SConscript
--- a/SConscript	Mon Dec 21 15:45:47 2009 +1100
+++ b/SConscript	Tue Dec 22 12:14:12 2009 +1100
@@ -227,10 +227,15 @@ env.PCUTest('tests/testPICellerator', su
 env.PCUTest('tests/testPICellerator', suites,
             PCU_LIBHEADERS="#include <StGermain/StGermain.h>\n#include <StgDomain/StgDomain.h>\n" \
                 "#include <StgFEM/StgFEM.h>\n#include <PICellerator/PICellerator.h>",
-            PCU_SETUP="StGermain_Init(&argc, &argv);StgDomain_Init(&argc, &argv);" \
-                "StgFEM_Init(&argc, &argv);PICellerator_Init(&argc, &argv);",
-            PCU_TEARDOWN="PICellerator_Finalise();StgFEM_Finalise();" \
-                "StgDomain_Finalise();StGermain_Finalise();",
+            PCU_SETUP="StGermain_Init(&argc, &argv);\nStgDomain_Init(&argc, &argv);\n" \
+                "StgFEM_Init(&argc, &argv);\nPICellerator_Init(&argc, &argv);\n\n" \
+                "#ifdef NOSHARED\n" \
+                "   picellerator_register_static_modules();\n" \
+                "   stgfem_register_static_modules();\n" \
+                "   stgdomain_register_static_modules();\n" \
+                "#endif",
+            PCU_TEARDOWN="PICellerator_Finalise();\nStgFEM_Finalise();\n" \
+                "StgDomain_Finalise();\nStGermain_Finalise();",
             LIBS=libs,
             PCU_EXP=tst_exp,
             PCU_INPUT=tst_input,