Commit 1a4e6222 authored by Nicholas Breen's avatar Nicholas Breen

Neaten up CMake booleans - stick to a consistent ON/OFF

parent 4b3c61e2
......@@ -32,7 +32,7 @@ COMMON_CONFIG_PARAMS = \
-DCMAKE_RULE_MESSAGES=OFF \
-DCMAKE_INSTALL_PREFIX="/usr" \
-DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \
-DCMAKE_SKIP_RPATH=TRUE \
-DCMAKE_SKIP_RPATH=ON \
-DGMX_X11=ON
# For compatibility reasons, disable SIMD CPU optimizations EXCEPT
......@@ -76,17 +76,17 @@ endif
MPICH_CONFIG_PARAMS = \
-DGMX_MPI=ON \
-DGMX_X11=OFF \
-DGMX_DEFAULT_SUFFIX=FALSE \
-DMPIEXEC="/usr/bin/mpiexec.mpich"
-DGMX_BUILD_MDRUN_ONLY=TRUE
-DGMX_DEFAULT_SUFFIX=OFF \
-DMPIEXEC="/usr/bin/mpiexec.mpich" \
-DGMX_BUILD_MDRUN_ONLY=ON
OPENMPI_CONFIG_PARAMS = \
-DGMX_MPI=ON \
-DGMX_X11=OFF \
-DGMX_DEFAULT_SUFFIX=FALSE \
-DGMX_DEFAULT_SUFFIX=OFF \
-DCMAKE_EXE_LINKER_FLAGS="-L/usr/lib/openmpi/lib $(LDFLAGS)" \
-DMPIEXEC="/usr/bin/mpiexec.openmpi"
-DGMX_BUILD_MDRUN_ONLY=TRUE
-DMPIEXEC="/usr/bin/mpiexec.openmpi" \
-DGMX_BUILD_MDRUN_ONLY=ON
# optional parallel build
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
......@@ -97,8 +97,8 @@ endif
configure: configure-stamp
configure-stamp:
dh_testdir
(mkdir -p build/basic; cd build/basic; cmake $(COMMON_CONFIG_PARAMS) $(GPU_CONFIG_PARAMS) -DGMX_MPI=OFF -DBUILD_SHARED_LIBS=TRUE)
(mkdir -p build/basic-dp; cd build/basic-dp; cmake $(COMMON_CONFIG_PARAMS) -DGMX_MPI=OFF -DBUILD_SHARED_LIBS=TRUE -DGMX_DOUBLE=ON)
(mkdir -p build/basic; cd build/basic; cmake $(COMMON_CONFIG_PARAMS) $(GPU_CONFIG_PARAMS) -DGMX_MPI=OFF -DBUILD_SHARED_LIBS=ON)
(mkdir -p build/basic-dp; cd build/basic-dp; cmake $(COMMON_CONFIG_PARAMS) -DGMX_MPI=OFF -DBUILD_SHARED_LIBS=ON -DGMX_DOUBLE=ON)
(mkdir -p build/mpich; cd build/mpich; CC=/usr/bin/mpicc.mpich CXX=/usr/bin/mpicxx.mpich cmake \
$(COMMON_CONFIG_PARAMS) $(MPICH_CONFIG_PARAMS) $(GPU_CONFIG_PARAMS) -DGMX_BINARY_SUFFIX="_mpi.mpich" -DGMX_LIBS_SUFFIX="_mpi.mpich")
(mkdir -p build/mpich-dp; cd build/mpich-dp; CC=/usr/bin/mpicc.mpich CXX=/usr/bin/mpicxx.mpich cmake \
......
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