-
-
Save dakl/2e117f04c41bdf7ce2f3 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
From 5f60239292d8d963997aeb14201e2e9eb2635c63 Mon Sep 17 00:00:00 2001 | |
From: Daniel Klevebring <[email protected]> | |
Date: Wed, 24 Sep 2014 06:42:15 +0000 | |
Subject: [PATCH] added quotes around to build on centos 6.5 | |
--- | |
Analysis/CMakeLists.txt | 2 +- | |
buildTools/cmake/CMakeLists.compiler.txt | 4 ++-- | |
buildTools/cmake/CMakeLists.dependencies.txt | 26 +++++++++++++------------- | |
buildTools/cmake/CMakeLists.version.txt | 6 +++--- | |
4 files changed, 19 insertions(+), 19 deletions(-) | |
diff --git a/Analysis/CMakeLists.txt b/Analysis/CMakeLists.txt | |
index aee8f3d..c20a88a 100644 | |
--- a/Analysis/CMakeLists.txt | |
+++ b/Analysis/CMakeLists.txt | |
@@ -317,7 +317,7 @@ if(ION_USE_CUDA) | |
endif() | |
endif() | |
-if (${LSB_RELEASE_CODENAME} STREQUAL "lucid") | |
+if ("${LSB_RELEASE_CODENAME}" STREQUAL "lucid") | |
set(LUCID_EXTRA_LIB lapack_atlas) | |
endif() | |
diff --git a/buildTools/cmake/CMakeLists.compiler.txt b/buildTools/cmake/CMakeLists.compiler.txt | |
index 02c472e..6d6ebc9 100644 | |
--- a/buildTools/cmake/CMakeLists.compiler.txt | |
+++ b/buildTools/cmake/CMakeLists.compiler.txt | |
@@ -6,7 +6,7 @@ IF(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE) | |
ENDIF() | |
# Common compiler flags | |
-if (${LSB_RELEASE_CODENAME} STREQUAL "lucid" OR ${LSB_RELEASE_CODENAME} STREQUAL "raring") | |
+if ("${LSB_RELEASE_CODENAME}" STREQUAL "lucid" OR "${LSB_RELEASE_CODENAME}" STREQUAL "raring") | |
set(ION_COMMON_FLAGS "${ION_COMMON_FLAGS} -Wall -Wextra -Werror -fPIC") | |
else() | |
set(ION_COMMON_FLAGS "${ION_COMMON_FLAGS} -Wall -Wextra -fPIC") | |
@@ -20,7 +20,7 @@ execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_C | |
# GCC depresses SSEx instructions when -mavx is used. Instead, it generates new AVX instructions or AVX equivalence for all SSEx instructions when needed. | |
if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU") | |
if(GCC_C_VERSION VERSION_EQUAL 4.4 OR (GCC_C_VERSION VERSION_GREATER 4.4) AND NOT CMAKE_SSE_ONLY) | |
- if (${LSB_RELEASE_CODENAME} STREQUAL "lucid") | |
+ if ("${LSB_RELEASE_CODENAME}" STREQUAL "lucid") | |
set(ION_COMMON_FLAGS "${ION_COMMON_FLAGS} -msse3") | |
else() | |
set(ION_COMMON_FLAGS "${ION_COMMON_FLAGS} -mavx") | |
diff --git a/buildTools/cmake/CMakeLists.dependencies.txt b/buildTools/cmake/CMakeLists.dependencies.txt | |
index d0ed5da..3baf30c 100644 | |
--- a/buildTools/cmake/CMakeLists.dependencies.txt | |
+++ b/buildTools/cmake/CMakeLists.dependencies.txt | |
@@ -26,7 +26,7 @@ mark_as_advanced(ION_USE_MKL) | |
option(ION_USE_SYSTEM_CUDA "Use CUDA system libraries" OFF) | |
mark_as_advanced(ION_USE_SYSTEM_CUDA) | |
-if (${LSB_RELEASE_CODENAME} STREQUAL "sid") | |
+if ("${LSB_RELEASE_CODENAME}" STREQUAL "sid") | |
option(ION_USE_CUDA "Compile CUDA code" ON) | |
else() | |
option(ION_USE_CUDA "Compile CUDA code" ON) | |
@@ -39,24 +39,24 @@ mark_as_advanced(ION_USE_SYSTEM_SAMTOOLS) | |
option(ION_USE_SYSTEM_BAMTOOLS "Use bamtools system libraries" OFF) | |
mark_as_advanced(ION_USE_SYSTEM_BAMTOOLS) | |
-if (${LSB_RELEASE_CODENAME} STREQUAL "sid" OR | |
- ${LSB_RELEASE_CODENAME} STREQUAL "jessie" OR | |
- ${LSB_RELEASE_CODENAME} STREQUAL "wheezy" OR | |
- ${LSB_RELEASE_CODENAME} STREQUAL "trusty" OR | |
- ${LSB_RELEASE_CODENAME} STREQUAL "saucy" OR | |
- ${LSB_RELEASE_CODENAME} STREQUAL "raring") | |
+if ("${LSB_RELEASE_CODENAME}" STREQUAL "sid" OR | |
+ "${LSB_RELEASE_CODENAME}" STREQUAL "jessie" OR | |
+ "${LSB_RELEASE_CODENAME}" STREQUAL "wheezy" OR | |
+ "${LSB_RELEASE_CODENAME}" STREQUAL "trusty" OR | |
+ "${LSB_RELEASE_CODENAME}" STREQUAL "saucy" OR | |
+ "${LSB_RELEASE_CODENAME}" STREQUAL "raring") | |
option(ION_USE_SYSTEM_FFTW "Use fftw system libraries" ON) | |
else() | |
option(ION_USE_SYSTEM_FFTW "Use fftw system libraries" OFF) | |
endif() | |
mark_as_advanced(ION_USE_SYSTEM_FFTW) | |
-if (${LSB_RELEASE_CODENAME} STREQUAL "sid" OR | |
- ${LSB_RELEASE_CODENAME} STREQUAL "jessie" OR | |
- ${LSB_RELEASE_CODENAME} STREQUAL "wheezy" OR | |
- ${LSB_RELEASE_CODENAME} STREQUAL "trusty" OR | |
- ${LSB_RELEASE_CODENAME} STREQUAL "saucy" OR | |
- ${LSB_RELEASE_CODENAME} STREQUAL "raring") | |
+if ("${LSB_RELEASE_CODENAME}" STREQUAL "sid" OR | |
+ "${LSB_RELEASE_CODENAME}" STREQUAL "jessie" OR | |
+ "${LSB_RELEASE_CODENAME}" STREQUAL "wheezy" OR | |
+ "${LSB_RELEASE_CODENAME}" STREQUAL "trusty" OR | |
+ "${LSB_RELEASE_CODENAME}" STREQUAL "saucy" OR | |
+ "${LSB_RELEASE_CODENAME}" STREQUAL "raring") | |
option(ION_USE_SYSTEM_HDF5 "Use hdf5 system libraries" ON) | |
else() | |
option(ION_USE_SYSTEM_HDF5 "Use hdf5 system libraries" OFF) | |
diff --git a/buildTools/cmake/CMakeLists.version.txt b/buildTools/cmake/CMakeLists.version.txt | |
index 84b8fa9..c809314 100644 | |
--- a/buildTools/cmake/CMakeLists.version.txt | |
+++ b/buildTools/cmake/CMakeLists.version.txt | |
@@ -42,17 +42,17 @@ if(LSB_RELEASE_COMMAND) | |
message(STATUS "LSB release codename: ${LSB_RELEASE_CODENAME}") | |
endif(LSB_RELEASE_COMMAND) | |
-if (${LSB_RELEASE_CODENAME} STREQUAL "lucid") | |
+if ("${LSB_RELEASE_CODENAME}" STREQUAL "lucid") | |
set(cuda_proj_version "5.5.22-16488124") | |
set(cuda_toolkit_tar_file "cuda-linux64-rel-5.5.22-16488124.tar.gz") | |
set(cuda_devdriver_file "devdriver_NVIDIA-Linux-x86_64-331.20-no-compat32.run") | |
set(CUDA_VERSION "5.5") | |
-elseif (${LSB_RELEASE_CODENAME} STREQUAL "oneiric") | |
+elseif ("${LSB_RELEASE_CODENAME}" STREQUAL "oneiric") | |
set(cuda_proj_version "5.5.22-16488124") | |
set(cuda_toolkit_tar_file "cuda-linux64-rel-5.5.22-16488124.tar.gz") | |
set(cuda_devdriver_file "devdriver_NVIDIA-Linux-x86_64-331.20-no-compat32.run") | |
set(CUDA_VERSION "5.5") | |
-elseif (${LSB_RELEASE_CODENAME} STREQUAL "trusty") | |
+elseif ("${LSB_RELEASE_CODENAME}" STREQUAL "trusty") | |
set(cuda_proj_version "5.5.22-16488124") | |
set(cuda_toolkit_tar_file "cuda-linux64-rel-5.5.22-16488124.tar.gz") | |
set(cuda_devdriver_file "devdriver_NVIDIA-Linux-x86_64-334.21-no-compat32.run") | |
-- | |
1.7.1 | |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment