[yt-svn] commit/yt: sskory: Let's just move the fKDpy.so file back where it has always been after compilation.
Bitbucket
commits-noreply at bitbucket.org
Tue Aug 7 20:15:56 PDT 2012
1 new commit in yt:
https://bitbucket.org/yt_analysis/yt/changeset/d8afbb316be3/
changeset: d8afbb316be3
branch: yt
user: sskory
date: 2012-08-08 05:14:24
summary: Let's just move the fKDpy.so file back where it has always been after compilation.
affected #: 2 files
diff -r 1b4b1087f896a09c333ba6af654bdd7acdf1b2be -r d8afbb316be369e3105df0b3b090fffc56e89257 yt/utilities/kdtree/Makefile
--- a/yt/utilities/kdtree/Makefile
+++ b/yt/utilities/kdtree/Makefile
@@ -12,6 +12,7 @@
# Forthon --compile_first fKD_source --no2underscores -g fKD fKD.f90 fKD_source.f90
@echo "Using $(FORTHON) ($(FORTHON_EXE))"
$(FORTHON) -F gfortran --compile_first fKD_source --no2underscores --fopt "-O3" fKD fKD_source.f90
+ mv build/lib*/fKDpy.so .
clean:
rm -rf build fKDpy.a fKDpy.so
diff -r 1b4b1087f896a09c333ba6af654bdd7acdf1b2be -r d8afbb316be369e3105df0b3b090fffc56e89257 yt/utilities/setup.py
--- a/yt/utilities/setup.py
+++ b/yt/utilities/setup.py
@@ -50,12 +50,7 @@
config.add_subpackage("answer_testing")
config.add_subpackage("delaunay") # From SciPy, written by Robert Kern
config.add_subpackage("kdtree")
- # The two fKDpy.so entries below are for different versions of
- # Forthon, which build the fKDpy.so object in different places
- # depending on version. The newest versions (0.8.10+) uses the
- # build/lib*/ directory.
config.add_data_files(('kdtree', ['kdtree/fKDpy.so']))
- config.add_data_files(('kdtree', ['kdtree/build/lib*/fKDpy.so']))
config.add_subpackage("spatial")
config.add_subpackage("grid_data_format")
config.add_subpackage("parallel_tools")
Repository URL: https://bitbucket.org/yt_analysis/yt/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
More information about the yt-svn
mailing list