"docs/UsersGuide/References.Data/vscode:/vscode.git/clone" did not exist on "cceb966c55b3e51abb7c6430163240cd78e11e14"
Commit 055e308a authored by Christopher Bruns's avatar Christopher Bruns
Browse files

CMake hacks to avoid serious errors when parsing CMakeLists.txt on Dart server with Cmake 2.4

parent dceb3d37
...@@ -259,6 +259,9 @@ FOREACH(subdir ${OPENMM_SOURCE_SUBDIRS}) ...@@ -259,6 +259,9 @@ FOREACH(subdir ${OPENMM_SOURCE_SUBDIRS})
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/include) INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/${subdir}/include)
ENDFOREACH(subdir) ENDFOREACH(subdir)
# Avoid dart server problem with cmake 2.4 --cmb
set(cmv "${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}")
# If API wrappers are being generated, and add them to the build. # If API wrappers are being generated, and add them to the build.
# Java and gccxml are required for API wrappers # Java and gccxml are required for API wrappers
FIND_PACKAGE(Java) FIND_PACKAGE(Java)
...@@ -274,8 +277,10 @@ ELSE(GCCXML_PATH AND JAVA_RUNTIME) ...@@ -274,8 +277,10 @@ ELSE(GCCXML_PATH AND JAVA_RUNTIME)
ENDIF(GCCXML_PATH AND JAVA_RUNTIME) ENDIF(GCCXML_PATH AND JAVA_RUNTIME)
IF(OPENMM_BUILD_API_WRAPPERS) IF(OPENMM_BUILD_API_WRAPPERS)
ADD_SUBDIRECTORY(wrappers) ADD_SUBDIRECTORY(wrappers)
SET(SOURCE_FILES ${SOURCE_FILES} wrappers/OpenMMCWrapper.cpp wrappers/OpenMMFortranWrapper.cpp) IF(NOT cmv EQUAL "2.4")
SET_SOURCE_FILES_PROPERTIES(wrappers/OpenMMCWrapper.cpp wrappers/OpenMMFortranWrapper.cpp PROPERTIES GENERATED TRUE) SET(SOURCE_FILES ${SOURCE_FILES} wrappers/OpenMMCWrapper.cpp wrappers/OpenMMFortranWrapper.cpp)
SET_SOURCE_FILES_PROPERTIES(wrappers/OpenMMCWrapper.cpp wrappers/OpenMMFortranWrapper.cpp PROPERTIES GENERATED TRUE)
ENDIF(NOT cmv EQUAL "2.4")
ENDIF(OPENMM_BUILD_API_WRAPPERS) ENDIF(OPENMM_BUILD_API_WRAPPERS)
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src) INCLUDE_DIRECTORIES(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/src)
...@@ -305,7 +310,9 @@ ADD_SUBDIRECTORY(platforms/reference/tests) ...@@ -305,7 +310,9 @@ ADD_SUBDIRECTORY(platforms/reference/tests)
# Which hardware platforms to build # Which hardware platforms to build
FIND_PACKAGE(CUDA QUIET) IF(NOT cmv EQUAL "2.4")
FIND_PACKAGE(CUDA QUIET)
ENDIF(NOT cmv EQUAL "2.4")
IF(CUDA_FOUND) IF(CUDA_FOUND)
SET(OPENMM_BUILD_CUDA_LIB ON CACHE BOOL "Build OpenMMCuda library for Nvidia GPUs") SET(OPENMM_BUILD_CUDA_LIB ON CACHE BOOL "Build OpenMMCuda library for Nvidia GPUs")
ELSE(CUDA_FOUND) ELSE(CUDA_FOUND)
...@@ -323,7 +330,9 @@ IF(OPENMM_BUILD_BROOK_LIB) ...@@ -323,7 +330,9 @@ IF(OPENMM_BUILD_BROOK_LIB)
ADD_SUBDIRECTORY(platforms/brook) ADD_SUBDIRECTORY(platforms/brook)
ENDIF(OPENMM_BUILD_BROOK_LIB) ENDIF(OPENMM_BUILD_BROOK_LIB)
FIND_PACKAGE(OpenCL QUIET) IF(NOT cmv EQUAL "2.4")
FIND_PACKAGE(OpenCL QUIET)
ENDIF(NOT cmv EQUAL "2.4")
IF(OPENCL_FOUND) IF(OPENCL_FOUND)
SET(OPENMM_BUILD_OPENCL_LIB ON CACHE BOOL "Build OpenMMOpenCL library for Nvidia GPUs") SET(OPENMM_BUILD_OPENCL_LIB ON CACHE BOOL "Build OpenMMOpenCL library for Nvidia GPUs")
ELSE(OPENCL_FOUND) ELSE(OPENCL_FOUND)
......
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