- example install removed again

- fix dependency cycle git-svn-id: https://ipvs.informatik.uni-stuttgart.de/SGpp/repos/trunk@4640 4eea3252-f0fb-4393-894d-40516dce545b
SGpp · Jul 30, 2015 · 56d84eb · 56d84eb
1 parent 710f99c
commit 56d84eb
Show file tree

Hide file tree

Showing 10 changed files with 3 additions and 42 deletions.
diff --git a/base/SConscript b/base/SConscript
@@ -61,7 +61,6 @@ for fileName in os.listdir("examples"):
                               LIBPATH=BUILD_DIR,
                               LIBS=libs + ["sgpp%s" % moduleName])
         env.Requires(example, libInstall)
-        env.Install(os.path.join(EXAMPLE_DIR.abspath, moduleName), example)
         exampleTargetList.append(example)
 
 # build unit tests

diff --git a/combigrid/SConscript b/combigrid/SConscript
@@ -47,7 +47,6 @@ for fileName in os.listdir("examples"):
                               LIBPATH=BUILD_DIR,
                               LIBS=libs + ["sgpp%s" % moduleName])
         env.Requires(example, libInstall)
-        env.Install(os.path.join(EXAMPLE_DIR.abspath, moduleName), example)
         exampleTargetList.append(example)
 
 libraryTargetList.append(lib)

diff --git a/datadriven/SConscript b/datadriven/SConscript
@@ -79,15 +79,14 @@ for fileName in os.listdir("examples"):
                               # LIBS=libs + ["sgpp%s" % moduleName]
                               )
         example_env.Requires(example, libInstall)
-        example_env.Install(os.path.join(EXAMPLE_DIR.abspath, moduleName), example)
         exampleTargetList.append(example)
 
 # build unit tests
 if env['COMPILE_BOOST_TESTS']:
     Import('boostTestTargetList')
     test_env = env.Clone()
     test_env.AppendUnique(LIBPATH=[BUILD_DIR, "#/lib/alglib"])
-    test_env.AppendUnique(LIBS=libs + ["sgpp%s" % moduleName, "boost_unit_test_framework"])
+    test_env.AppendUnique(LIBS=libs + ["sgpp%s" % moduleName, "boost_unit_test_framework", "z"])
     testObjects = []
     for fileName in os.listdir("tests"):
         if fnmatch.fnmatch(fileName, "*.cpp"):

diff --git a/datadriven/tests/testTest1.cpp b/datadriven/tests/testTest1.cpp
diff --git a/datadriven/tests/testTest2.cpp b/datadriven/tests/testTest2.cpp
diff --git a/finance/SConscript b/finance/SConscript
@@ -11,7 +11,7 @@ Import('BUILD_DIR')
 Import('EXAMPLE_DIR')
 Import('moduleName')
 
-libs = ['sgppbase', 'sgpppde', 'sgppdatadriven', 'sgppfinance']
+libs = ['sgppbase', 'sgpppde', 'sgppdatadriven']
 
 srcs = []
 for currentFolder, subdirNames, fileNames in os.walk("."):
@@ -27,14 +27,9 @@ lib = env.SharedLibrary(target="sgpp" + moduleName,
                         source=objs,
                         LIBPATH=BUILD_DIR,
                         LIBS=libs)
-#env.Depends(lib, "#/" + BUILD_DIR.path + "/libsgppbase.so")
+
 env.Depends(lib, "#/" + BUILD_DIR.path + "/" + env["LIBPREFIX"] + "sgppbase" + env["SHLIBSUFFIX"])                        
-#env.Depends(lib, "#/" + BUILD_DIR.path + "/libsgpppde.so")
 env.Depends(lib, "#/" + BUILD_DIR.path + "/" + env["LIBPREFIX"] + "sgpppde" + env["SHLIBSUFFIX"])
-#env.Depends(lib, "#/" + BUILD_DIR.path + "/libsgppdatadriven.so")
-env.Depends(lib, "#/" + BUILD_DIR.path + "/" + env["LIBPREFIX"] + "sgppdatadriven" + env["SHLIBSUFFIX"])
-#env.Depends(lib, "#/" + BUILD_DIR.path + "/libsgppfinance.so")
-env.Depends(lib, "#/" + BUILD_DIR.path + "/" + env["LIBPREFIX"] + "sgppfinance" + env["SHLIBSUFFIX"])
 libInstall = env.Install(BUILD_DIR, lib)
 
 if not env['NO_UNIT_TESTS'] and env['SG_PYTHON']:
@@ -50,7 +45,6 @@ for fileName in os.listdir("examples"):
                               LIBPATH=BUILD_DIR,
                               LIBS=libs + ["sgpp%s" % moduleName])
         env.Requires(example, libInstall)
-        env.Install(os.path.join(EXAMPLE_DIR.abspath, moduleName), example)
         exampleTargetList.append(example)
 
 Import('libraryTargetList')

diff --git a/parallel/SConscript b/parallel/SConscript
@@ -141,7 +141,6 @@ for fileName in os.listdir("examples"):
                               LIBPATH=BUILD_DIR,
                               LIBS=libs + ["sgpp%s" % moduleName])
         env.Requires(example, libInstall)
-        env.Install(os.path.join(EXAMPLE_DIR.abspath, moduleName), example)
         exampleTargetList.append(example)
 
 Import('libraryTargetList')

diff --git a/pde/SConscript b/pde/SConscript
@@ -48,7 +48,6 @@ for fileName in os.listdir("examples"):
                               LIBPATH=BUILD_DIR,
                               LIBS=libs + ["sgpp%s" % moduleName])
         env.Requires(example, libInstall)
-        env.Install(os.path.join(EXAMPLE_DIR.abspath, moduleName), example)
         exampleTargetList.append(example)
 
 libraryTargetList.append(lib)

diff --git a/quadrature/SConscript b/quadrature/SConscript
@@ -50,7 +50,6 @@ for fileName in os.listdir("examples"):
                               LIBPATH=BUILD_DIR,
                               LIBS=libs + ["sgpp%s" % moduleName])
         env.Requires(example, libInstall)
-        env.Install(os.path.join(EXAMPLE_DIR.abspath, moduleName), example)
         exampleTargetList.append(example)
 
 libraryTargetList.append(lib)

diff --git a/solver/SConscript b/solver/SConscript
@@ -52,7 +52,6 @@ for fileName in os.listdir("examples"):
                               LIBPATH=BUILD_DIR,
                               LIBS=libs + ["sgpp%s" % moduleName])
         env.Requires(example, libInstall)
-        env.Install(os.path.join(EXAMPLE_DIR.abspath, moduleName), example)
         exampleTargetList.append(example)
 
 libraryTargetList.append(lib)