projects
/
unres.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changes in shielding
[unres.git]
/
CMakeLists.txt
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
3a2d1d7
..
bd9465a
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-63,6
+63,13
@@
MACRO (CINFO_FORMAT FN VN VD)
file(APPEND ${FN} " write(iout,*)'${STR}'\n")
endif(SUMA GREATER 50)
ENDMACRO (CINFO_FORMAT)
file(APPEND ${FN} " write(iout,*)'${STR}'\n")
endif(SUMA GREATER 50)
ENDMACRO (CINFO_FORMAT)
+
+# Some MPI wrappers pass double include paths
+# This macro fixes broken by semicolon occurence in path
+MACRO (FIX_DBL_INCLUDE RESULT)
+ string(REPLACE ";" " -I" ${RESULT} "${${RESULT}}")
+ENDMACRO (FIX_DBL_INCLUDE)
+
#======================================
# CTest stuff
#======================================A
#======================================
# CTest stuff
#======================================A
@@
-86,8
+93,8
@@
SET(CMAKE_Fortran_COMPILE_OBJECT "<CMAKE_Fortran_COMPILER> ${CMAKE_START_TEMP_F
# make sure that the default is a RELEASE
if (NOT CMAKE_BUILD_TYPE)
# make sure that the default is a RELEASE
if (NOT CMAKE_BUILD_TYPE)
- set (CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: None Debug Release." FORCE)
- set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "None" "Debug" "Release" )
+ set (CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo." FORCE)
+ set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "None" "Debug" "Release" "RelWithDebInfo")
endif (NOT CMAKE_BUILD_TYPE)
endif (NOT CMAKE_BUILD_TYPE)
@@
-99,6
+106,10
@@
else()
set( CMAKE_VERBOSE_MAKEFILE 1 )
endif (CMAKE_BUILD_TYPE STREQUAL "Release")
set( CMAKE_VERBOSE_MAKEFILE 1 )
endif (CMAKE_BUILD_TYPE STREQUAL "Release")
+# Default Install Path
+
+set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/bin" CACHE PATH "Binary install directory " FORCE)
+
#=======================================
# Set the varous build variables
#=======================================
#=======================================
# Set the varous build variables
#=======================================
@@
-132,6
+143,7
@@
find_package(MPI QUIET)
if (MPI_Fortran_FOUND)
message("MPI found")
if (MPI_Fortran_FOUND)
message("MPI found")
+ FIX_DBL_INCLUDE(MPI_Fortran_INCLUDE_PATH)
else()
message("MPI not found - disabling MPI compile flags ")
set ( UNRES_WITH_MPI "OFF")
else()
message("MPI not found - disabling MPI compile flags ")
set ( UNRES_WITH_MPI "OFF")
@@
-156,30
+168,21
@@
message("Detected ${architektura}-bit architecture")
# used by unres/src_MIN
find_package (Threads)
# used by unres/src_MIN
find_package (Threads)
-
-
-#=======================================
-# Create diractories for build targets
-#=======================================
-#execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_BINARY_DIR}/bin/unres/MD )
-
#=======================================
# Add source files
#=======================================
#=======================================
# Add source files
#=======================================
-
add_subdirectory(source/lib/xdrf)
add_subdirectory(source/lib/xdrf)
-
if(UNRES_NA_MMCE)
if(UNRES_WITH_MPI)
# Brak MPI dla gfortrana, wiec tylko na ifort sie skompiluje
if (Fortran_COMPILER_NAME STREQUAL "ifort")
add_subdirectory(source/unres/src_MD)
if(UNRES_NA_MMCE)
if(UNRES_WITH_MPI)
# Brak MPI dla gfortrana, wiec tylko na ifort sie skompiluje
if (Fortran_COMPILER_NAME STREQUAL "ifort")
add_subdirectory(source/unres/src_MD)
+ add_subdirectory(source/unres/src_MD_DFA)
add_subdirectory(source/unres/src_MD-M)
add_subdirectory(source/unres/src_CSA)
add_subdirectory(source/unres/src_MD-M)
add_subdirectory(source/unres/src_CSA)
- add_subdirectory(source/unres/src_CSA_DiL)
add_subdirectory(source/cluster/wham/src)
add_subdirectory(source/cluster/wham/src-M)
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
add_subdirectory(source/cluster/wham/src)
add_subdirectory(source/cluster/wham/src-M)
endif (Fortran_COMPILER_NAME STREQUAL "ifort")
@@
-192,14
+195,14
@@
if(UNRES_NA_MMCE)
add_subdirectory(source/cluster/unres/src)
add_subdirectory(source/xdrfpdb/src)
add_subdirectory(source/xdrfpdb/src-M)
add_subdirectory(source/cluster/unres/src)
add_subdirectory(source/xdrfpdb/src)
add_subdirectory(source/xdrfpdb/src-M)
- add_subdirectory(source/maxlik/src_CSA)
+# add_subdirectory(source/maxlik/src_CSA)
else()
add_subdirectory(source/unres/src_MD)
if(UNRES_WITH_MPI)
add_subdirectory(source/unres/src_MD-M)
else()
add_subdirectory(source/unres/src_MD)
if(UNRES_WITH_MPI)
add_subdirectory(source/unres/src_MD-M)
+ add_subdirectory(source/unres/src_MD_DFA)
add_subdirectory(source/unres/src_CSA)
add_subdirectory(source/unres/src_CSA)
- add_subdirectory(source/unres/src_CSA_DiL)
add_subdirectory(source/wham/src)
add_subdirectory(source/wham/src-M)
add_subdirectory(source/cluster/wham/src)
add_subdirectory(source/wham/src)
add_subdirectory(source/wham/src-M)
add_subdirectory(source/cluster/wham/src)
@@
-209,6
+212,6
@@
else()
add_subdirectory(source/cluster/unres/src)
add_subdirectory(source/xdrfpdb/src)
add_subdirectory(source/xdrfpdb/src-M)
add_subdirectory(source/cluster/unres/src)
add_subdirectory(source/xdrfpdb/src)
add_subdirectory(source/xdrfpdb/src-M)
- add_subdirectory(source/maxlik/src_CSA)
+# add_subdirectory(source/maxlik/src_CSA)
endif(UNRES_NA_MMCE)
endif(UNRES_NA_MMCE)