Commit 88fa7542 authored by John Chodera (MSKCC)'s avatar John Chodera (MSKCC)
Browse files

Changed source install manifest to allow us to pick from source distro or...

Changed source install manifest to allow us to pick from source distro or compiled (install/) output.
parent 4543bca2
cmake_modules openmm/cmake_modules
CMakeLists.txt openmm/CMakeLists.txt
docs-source openmm/docs-source
docs install/docs
examples openmm/examples
libraries openmm/libraries
olla openmm/olla
openmmapi openmm/openmmapi
platforms openmm/platforms
plugins openmm/plugins
serialization openmm/serialization
tests openmm/tests
wrappers openmm/wrappers
...@@ -30,10 +30,10 @@ CMAKE_FLAGS+=" -DOPENMM_BUILD_RPMD_CUDA_LIB=OFF" ...@@ -30,10 +30,10 @@ CMAKE_FLAGS+=" -DOPENMM_BUILD_RPMD_CUDA_LIB=OFF"
CMAKE_FLAGS+=" -DOPENMM_BUILD_RPMD_OPENCL_LIB=OFF" CMAKE_FLAGS+=" -DOPENMM_BUILD_RPMD_OPENCL_LIB=OFF"
# Set location for FFTW3 # Set location for FFTW3
PREFIX="$WORKSPACE/miniconda" #PREFIX="$WORKSPACE/miniconda"
CMAKE_FLAGS+=" -DFFTW_INCLUDES=$PREFIX/include" #CMAKE_FLAGS+=" -DFFTW_INCLUDES=$PREFIX/include"
CMAKE_FLAGS+=" -DFFTW_LIBRARY=$PREFIX/lib/libfftw3f.so" #CMAKE_FLAGS+=" -DFFTW_LIBRARY=$PREFIX/lib/libfftw3f.so"
CMAKE_FLAGS+=" -DFFTW_THREADS_LIBRARY=$PREFIX/lib/libfftw3f_threads.so" #CMAKE_FLAGS+=" -DFFTW_THREADS_LIBRARY=$PREFIX/lib/libfftw3f_threads.so"
# Build in subdirectory. # Build in subdirectory.
if [ -e build ]; then if [ -e build ]; then
......
...@@ -19,7 +19,7 @@ rm -rf $PACKAGE_DIR ...@@ -19,7 +19,7 @@ rm -rf $PACKAGE_DIR
mkdir $PACKAGE_DIR mkdir $PACKAGE_DIR
mkdir $PACKAGE_DIR/$PACKAGE_SUBDIR mkdir $PACKAGE_DIR/$PACKAGE_SUBDIR
for filename in $( cat openmm/devtools/packaging/manifests/source/manifest.txt ); do for filename in $( cat openmm/devtools/packaging/manifests/source/manifest.txt ); do
CMD="cp -r install/$filename $PACKAGE_DIR/$PACKAGE_SUBDIR" CMD="cp -r $filename $PACKAGE_DIR/$PACKAGE_SUBDIR"
echo $CMD echo $CMD
`$CMD` `$CMD`
done done
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment