add c++14 as an option to cmake

Author: zhi-wang

CMakeLists.txt

@@ -144,6 +144,24 @@ else ()
 endif ()
 
 
+#[[
+!!/ **-DSTD (std) = 11**
+!!/
+!!/ C++ syntax standard. The source code is c++11-compliant, and should have no
+!!/ problems compiled with c++14. If set to *14* here, users should make sure
+!!/ the compilers are c++14-compliant.
+!!/
+]]
+if (DEFINED ENV{std})
+   set (stdValue $ENV{std})
+else ()
+   set (stdValue 11)
+endif ()
+set (STD ${stdValue} CACHE STRING "C++ standard: 11 and 14.")
+set_property (CACHE STD PROPERTY STRINGS 11 14)
+set (T9_CPPSTD ${STD})
+
+
 #[[
 !!/ **-DPREC (prec) = mixed**
 !!/
@@ -238,7 +256,7 @@ else ()
    set (compCapValue 60,70)
 endif ()
 set (COMPUTE_CAPABILITY ${compCapValue} CACHE STRING
-   "CUDA Compute Capability Multiplied by 10 (Comma-Separated)"
+   "[GPU ONLY] CUDA Compute Capability Multiplied by 10 (Comma-Separated)"
 )
 ## Compute Capability 60,70 -> 60;70
 string (REPLACE "," ";" T9_CUCCLIST ${COMPUTE_CAPABILITY}) # 60;70
@@ -273,7 +291,7 @@ elseif (DEFINED ENV{CUDACXX})
 else ()
    set (cudaDirValue /usr/local/cuda)
 endif ()
-set (CUDA_DIR ${cudaDirValue} CACHE PATH "CUDA Directory")
+set (CUDA_DIR ${cudaDirValue} CACHE PATH "[GPU ONLY] CUDA Directory")
 ## cuda compiler
 ## set CMAKE_CUDA_COMPILER before project ()   
 if (NOT HOST)
@@ -298,7 +316,7 @@ if (DEFINED ENV{fftw_dir})
 else ()
    set (fftwDirValue "${CMAKE_BINARY_DIR}/fftw")
 endif ()
-set (FFTW_DIR ${fftwDirValue} CACHE PATH "FFTW3 Directory")
+set (FFTW_DIR ${fftwDirValue} CACHE PATH "[CPU ONLY] FFTW3 Directory")
 
 
 #[[
@@ -553,6 +571,7 @@ ExternalProject_Add (src-acc
       "-DCMAKE_CXX_COMPILER=${T9_ACC_COMPILER}"
       "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
       "-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/src-acc"
+      "-DT9_CPPSTD=${T9_CPPSTD}"
       "-DT9_SYS_INCPATH=${T9_EP_ACC_SYS_INCPATH}"
       "-DT9_INCPATH=${T9_EP_ACC_INCPATH}"
       "-DT9_ACC_DEFS=${T9_EP_ACC_MACRO}"
@@ -583,7 +602,7 @@ add_library (__t9_all_tests_o OBJECT ${T9_TEST_SRC})
 target_compile_definitions (__t9_all_tests_o PRIVATE ${T9_DEFS})
 set_target_properties (__t9_all_tests_o PROPERTIES
    CXX_STANDARD
-      11
+      ${T9_CPPSTD}
 )
 target_include_directories (__t9_all_tests_o SYSTEM PRIVATE "${T9_SYS_INCPATH}")
 target_include_directories (__t9_all_tests_o PRIVATE

cmake/device.cmake

@@ -1,7 +1,7 @@
 add_library (tinker9_main OBJECT src-main/main_tinker9.cpp)
 set_target_properties (tinker9_main PROPERTIES
    CXX_STANDARD
-      11
+      ${T9_CPPSTD}
 )
 target_compile_definitions (tinker9_main PRIVATE "${T9_DEFS}")
 target_include_directories (tinker9_main SYSTEM PRIVATE "${T9_SYS_INCPATH}")

cmake/host.cmake

@@ -2,7 +2,7 @@ add_executable (tinker9 src-main/main_tinker9.cpp)
 add_dependencies (tinker9 src-acc src-libtinker)
 set_target_properties (tinker9 PROPERTIES
    CXX_STANDARD
-      11
+      ${T9_CPPSTD}
 )
 target_compile_definitions (tinker9 PRIVATE "${T9_DEFS}")
 target_include_directories (tinker9 SYSTEM PRIVATE "${T9_SYS_INCPATH}")

doc/manual/m/install/buildwithcmake.rst

@@ -85,6 +85,12 @@ Install the executables under *${CMAKE_INSTALL_PREFIX}*. If this option is
 not set, *make install* is configured not to install anything, which is
 different from the default cmake behavior to install the program under */usr/local*.
 
+**-DSTD (std) = 11**
+
+C++ syntax standard. The source code is c++11-compliant, and should have no
+problems compiled with c++14. If set to *14* here, users should make sure
+the compilers are c++14-compliant.
+
 **-DPREC (prec) = mixed**
 
 Precision of the floating-point numbers. With flag *double*/*d*, all of the

src-acc/CMakeLists.txt

@@ -23,7 +23,7 @@ file (GLOB __T9_ACC_SRC "*_acc.cpp")
 add_library (tinker9_acc STATIC "${__T9_ACC_SRC}")
 set_target_properties (tinker9_acc PROPERTIES
    CXX_STANDARD
-      11
+      ${T9_CPPSTD}
 )
 target_compile_definitions (tinker9_acc PRIVATE "${T9_ACC_DEFS}")
 target_include_directories (tinker9_acc SYSTEM PRIVATE "${T9_SYS_INCPATH}")

src-cu/CMakeLists.txt

@@ -12,7 +12,7 @@ file (GLOB __T9_CUDA_SRC "*_cu.cu")
 add_library (tinker9_cu STATIC "${__T9_CUDA_SRC}")
 set_target_properties (tinker9_cu PROPERTIES
    CUDA_STANDARD
-      11
+      ${T9_CPPSTD}
 )
 target_compile_definitions (tinker9_cu PRIVATE ${T9_DEFS})
 target_include_directories (tinker9_cu SYSTEM PRIVATE "${T9_SYS_INCPATH}")

src/CMakeLists.txt

@@ -12,7 +12,7 @@ endif ()
 add_library (__t9_cpp_o OBJECT "${__T9_CPP_SRC}")
 set_target_properties (__t9_cpp_o PROPERTIES
    CXX_STANDARD
-      11
+      ${T9_CPPSTD}
 )
 target_compile_definitions (__t9_cpp_o PRIVATE "${T9_DEFS}")
 target_include_directories (__t9_cpp_o SYSTEM PRIVATE "${T9_SYS_INCPATH}")
@@ -25,7 +25,7 @@ add_library (__t9_version_related_o OBJECT
 )
 set_target_properties (__t9_version_related_o PROPERTIES
    CXX_STANDARD
-      11
+      ${T9_CPPSTD}
 )
 if (__T9_GIT_SHA1)
    target_compile_definitions (__t9_version_related_o PRIVATE

src/cudart/thrust_cache.cpp

@@ -12,7 +12,7 @@ ThrustCache::ThrustCache()
 
 auto ThrustCache::allocate(ptrdiff_t numbyte) -> value_type*
 {
-   if (numbyte > nbytes) {
+   if ((size_t)numbyte > nbytes) {
       nbytes = numbyte;
       device_memory_deallocate_bytes(ptr);
       device_memory_allocate_bytes(reinterpret_cast<void**>(&ptr), nbytes);