X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=blobdiff_plain;f=CMakeLists.txt;h=699a92a3c2036854a487530d7a00e38c5d3bad76;hp=87cffd93af3c204d7a9603ea047718fea476f54d;hb=refs%2Fheads%2Fczarek;hpb=3a3ee5013eef26f00c82b6948724fd9c54accc15

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 87cffd9..699a92a 100644
--- 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)
+
+# 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
@@ -70,8 +77,6 @@ ENDMACRO (CINFO_FORMAT)
 include(CTest)
 enable_testing()
  
-# Set makefile verbose on
-set( CMAKE_VERBOSE_MAKEFILE 1 )
 
 #======================================
 # Fortran compilers stuff
@@ -88,10 +93,23 @@ 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)
-  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)
-   
+
+
+if (CMAKE_BUILD_TYPE STREQUAL "Release")
+  # Set makefile verbosity off for Release builds
+  set( CMAKE_VERBOSE_MAKEFILE 0 )
+else()
+  # Set makefile verbosity on for other builds
+  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 
 #=======================================
@@ -125,6 +143,7 @@ find_package(MPI QUIET)
 
 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")
@@ -149,13 +168,6 @@ message("Detected ${architektura}-bit architecture")
 # 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
 #=======================================     
@@ -172,7 +184,6 @@ if(UNRES_NA_MMCE)
       add_subdirectory(source/unres/src_MD)
       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")
@@ -185,14 +196,12 @@ if(UNRES_NA_MMCE)
   add_subdirectory(source/cluster/unres/src)
   add_subdirectory(source/xdrfpdb/src)
   add_subdirectory(source/xdrfpdb/src-M)
-  add_subdirectory(source/maxlik/src_CSA)
 else()
 
   add_subdirectory(source/unres/src_MD)
   if(UNRES_WITH_MPI)
     add_subdirectory(source/unres/src_MD-M)
     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)
@@ -202,6 +211,5 @@ else()
   add_subdirectory(source/cluster/unres/src)
   add_subdirectory(source/xdrfpdb/src)
   add_subdirectory(source/xdrfpdb/src-M)
-  add_subdirectory(source/maxlik/src_CSA)
 endif(UNRES_NA_MMCE)