1) binaries are compiled into /bin subdirectory of build directory

2) added "make install" support costumizable with CMAKE_INSTALL_PREFIX

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3a2d1d7..54c8f7f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -99,6 +99,10 @@ else()
   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 
 #=======================================
@@ -156,13 +160,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
 #=======================================     

diff --git a/source/cluster/unres/src/CMakeLists.txt b/source/cluster/unres/src/CMakeLists.txt
index e4e43fc..389c3d1 100644 (file)
--- a/source/cluster/unres/src/CMakeLists.txt
+++ b/source/cluster/unres/src/CMakeLists.txt
@@ -71,23 +71,7 @@ set_property(SOURCE ${UNRES_CLUSTER_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFL
 #========================================
 #  Setting binary name
 #========================================
-set(UNRES_CLUSTER_BIN "unres_clustMD.exe")
-
-#=========================================
-# cinfo.f stupid workaround for cmake
-#  - shame on me ]:)
-#=========================================
-#set_property(SOURCE compinfo.c PROPERTY CMAKE_C_FLAGS "-c" )
-#add_executable(compinfo-wham-m compinfo.c)
-#set_target_properties(compinfo-wham-m PROPERTIES OUTPUT_NAME compinfo)
-
-#set(UNRES_CINFO_DIR "${CMAKE_CURRENT_BINARY_DIR}" )
-#add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cinfo.f 
-#      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cinfo.f ${CMAKE_CURRENT_BINARY_DIR}/cinfo.f
-#      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/COMMON.IOUNITS ${CMAKE_CURRENT_BINARY_DIR}/COMMON.IOUNITS 
-#      COMMAND ${CMAKE_CURRENT_BINARY_DIR}/compinfo | true     
-#      DEPENDS compinfo-wham-m )
-#set_property(SOURCE ${UNRES_CINFO_DIR}/cinfo.f PROPERTY COMPILE_FLAGS ${FFLAGS0} )
+set(UNRES_CLUSTER_BIN "cluster_unres_${Fortran_COMPILER_NAME}.exe")
 
 #=========================================
 # Set full unres CLUSTER sources
@@ -99,89 +83,11 @@ set(UNRES_CLUSTER_SRCS ${UNRES_CLUSTER_UNRES_SRC0} )
 #=========================================
 add_executable(UNRES_CLUSTER_BIN ${UNRES_CLUSTER_SRCS} )
 set_target_properties(UNRES_CLUSTER_BIN PROPERTIES OUTPUT_NAME ${UNRES_CLUSTER_BIN})
+set_property(TARGET UNRES_CLUSTER_BIN PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 
 
 #=========================================
-# TESTS 
-#=========================================
-
-#-- Copy all the data files from the test directory into the source directory
-#SET(UNRES_TEST_FILES
-#      ala10.inp
-#    )
-
-#FOREACH (UNRES_TEST_FILE ${UNRES_TEST_FILES})
-#      SET (unres_test_dest "${CMAKE_CURRENT_BINARY_DIR}/${UNRES_TEST_FILE}")
-#      MESSAGE (STATUS " Copying ${UNRES_TEST_FILE} from ${CMAKE_SOURCE_DIR}/examples/unres/MD/ff_gab/${UNRES_TEST_FILE} to ${unres_test_dest}")
-#      ADD_CUSTOM_COMMAND (
-#          TARGET     ${UNRES_BIN}
-#          POST_BUILD
-#          COMMAND    ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/examples/unres/MD/ff_gab/${UNRES_TEST_FILE} ${unres_test_dest}
-#      )
-#ENDFOREACH (UNRES_TEST_FILE ${UNRES_TEST_FILES})
-
-#=========================================
-# Generate data test files
-#=========================================
-#  test_single_ala.sh
-#=========================================
-
-#FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_single_ala.sh
-#"#!/bin/sh
-#export POT=GB
-#export PREFIX=ala10
-#-----------------------------------------------------------------------------
-#UNRES_BIN=./${UNRES_BIN}
-#-----------------------------------------------------------------------------
-#DD=${CMAKE_SOURCE_DIR}/PARAM
-#export BONDPAR=$DD/bond.parm
-#export THETPAR=$DD/thetaml.5parm
-#export ROTPAR=$DD/scgauss.parm
-#export TORPAR=$DD/torsion_631Gdp.parm
-#export TORDPAR=$DD/torsion_double_631Gdp.parm
-#export ELEPAR=$DD/electr_631Gdp.parm
-#export SIDEPAR=$DD/sc_GB_opt.1gab_3S_qclass5no310-shan2-sc-16-10-8k
-#export FOURIER=$DD/fourier_opt.parm.1igd_hc_iter3_3
-#export SCPPAR=$DD/scp.parm
-#export SCCORPAR=$DD/rotcorr_AM1.parm
-#export PATTERN=$DD/patterns.cart
-#-----------------------------------------------------------------------------
-#$UNRES_BIN
-#")
-
-#=========================================
-#  ala10.inp
+# Install Path
 #=========================================
+install(TARGETS UNRES_CLUSTER_BIN DESTINATION ${CMAKE_INSTALL_PREFIX})
 
-#file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/ala10.inp
-#"ala10 unblocked
-#SEED=-1111333 MD ONE_LETTER rescale_mode=2 PDBOUT
-#nstep=15000 ntwe=100 ntwx=1000 dt=0.1 lang=0 tbf t_bath=300 damax=1.0          &
-#reset_moment=1000 reset_vel=1000 MDPDB
-#WLONG=1.35279 WSCP=1.59304 WELEC=0.71534 WBOND=1.00000 WANG=1.13873            &
-#WSCLOC=0.16258 WTOR=1.98599 WTORD=1.57069 WCORRH=0.42887 WCORR5=0.00000        &
-#WCORR6=0.00000 WEL_LOC=0.16036 WTURN3=1.68722 WTURN4=0.66230 WTURN6=0.00000    &
-#WVDWPP=0.11371 WHPB=1.00000                                                    &
-#CUTOFF=7.00000 WCORR4=0.00000
-#12
-#XAAAAAAAAAAX 
-# 0
-# 0
-#   90.0000   90.0000   90.0000  90.000   90.000   90.000   90.000   90.000 
-#   90.0000   90.0000
-#  180.0000  180.0000  180.0000 180.000  180.000  180.000  180.000  180.000
-#  180.0000
-#  110.0000  110.0000  110.0000 100.000  110.000  100.000  110.000  110.000 
-#  110.0000  110.0000
-# -120.0000 -120.0000 -120.000 -120.000 -120.000 -120.000 -120.000 -120.000
-# -120.0000 -120.0000
-#")
-
-
-# Add tests
-
-#if(NOT UNRES_WITH_MPI)
-
-#  add_test(NAME UNRES_MD_Ala10 COMMAND sh ${CMAKE_CURRENT_BINARY_DIR}/test_single_ala.sh )
-
-#endif(NOT UNRES_WITH_MPI)

diff --git a/source/cluster/wham/src-M/CMakeLists.txt b/source/cluster/wham/src-M/CMakeLists.txt
index 7642654..2ce99e2 100644 (file)
--- a/source/cluster/wham/src-M/CMakeLists.txt
+++ b/source/cluster/wham/src-M/CMakeLists.txt
@@ -138,23 +138,7 @@ set_property(SOURCE proc_proc.c PROPERTY COMPILE_DEFINITIONS "LINUX -DPGI" )
 #========================================
 #  Setting binary name
 #========================================
-set(UNRES_CLUSTER_WHAM_M_BIN "unres_clustMD.exe")
-
-#=========================================
-# cinfo.f stupid workaround for cmake
-#  - shame on me ]:)
-#=========================================
-#set_property(SOURCE compinfo.c PROPERTY CMAKE_C_FLAGS "-c" )
-#add_executable(compinfo-wham-m compinfo.c)
-#set_target_properties(compinfo-wham-m PROPERTIES OUTPUT_NAME compinfo)
-
-#set(UNRES_CINFO_DIR "${CMAKE_CURRENT_BINARY_DIR}" )
-#add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cinfo.f 
-#      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cinfo.f ${CMAKE_CURRENT_BINARY_DIR}/cinfo.f
-#      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/COMMON.IOUNITS ${CMAKE_CURRENT_BINARY_DIR}/COMMON.IOUNITS 
-#      COMMAND ${CMAKE_CURRENT_BINARY_DIR}/compinfo | true     
-#      DEPENDS compinfo-wham-m )
-#set_property(SOURCE ${UNRES_CINFO_DIR}/cinfo.f PROPERTY COMPILE_FLAGS ${FFLAGS0} )
+set(UNRES_CLUSTER_WHAM_M_BIN "cluster_wham-M_${Fortran_COMPILER_NAME}.exe")
 
 #=========================================
 # Set full unres CLUSTER sources
@@ -166,6 +150,7 @@ set(UNRES_CLUSTER_WHAM_M_SRCS ${UNRES_CLUSTER_WHAM_M_SRC0} proc_proc.c)
 #=========================================
 add_executable(UNRES_CLUSTER_WHAM_M_BIN ${UNRES_CLUSTER_WHAM_M_SRCS} )
 set_target_properties(UNRES_CLUSTER_WHAM_M_BIN PROPERTIES OUTPUT_NAME ${UNRES_CLUSTER_WHAM_M_BIN})
+set_property(TARGET UNRES_CLUSTER_WHAM_M_BIN PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 
 #=========================================
 # Link libraries
@@ -177,87 +162,9 @@ endif(UNRES_WITH_MPI)
 # link libxdrf.a 
 target_link_libraries( UNRES_CLUSTER_WHAM_M_BIN xdrf )
 
-#=========================================
-# TESTS 
-#=========================================
-
-#-- Copy all the data files from the test directory into the source directory
-#SET(UNRES_TEST_FILES
-#      ala10.inp
-#    )
-
-#FOREACH (UNRES_TEST_FILE ${UNRES_TEST_FILES})
-#      SET (unres_test_dest "${CMAKE_CURRENT_BINARY_DIR}/${UNRES_TEST_FILE}")
-#      MESSAGE (STATUS " Copying ${UNRES_TEST_FILE} from ${CMAKE_SOURCE_DIR}/examples/unres/MD/ff_gab/${UNRES_TEST_FILE} to ${unres_test_dest}")
-#      ADD_CUSTOM_COMMAND (
-#          TARGET     ${UNRES_BIN}
-#          POST_BUILD
-#          COMMAND    ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/examples/unres/MD/ff_gab/${UNRES_TEST_FILE} ${unres_test_dest}
-#      )
-#ENDFOREACH (UNRES_TEST_FILE ${UNRES_TEST_FILES})
-
-#=========================================
-# Generate data test files
-#=========================================
-#  test_single_ala.sh
-#=========================================
-
-#FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_single_ala.sh
-#"#!/bin/sh
-#export POT=GB
-#export PREFIX=ala10
-#-----------------------------------------------------------------------------
-#UNRES_BIN=./${UNRES_BIN}
-#-----------------------------------------------------------------------------
-#DD=${CMAKE_SOURCE_DIR}/PARAM
-#export BONDPAR=$DD/bond.parm
-#export THETPAR=$DD/thetaml.5parm
-#export ROTPAR=$DD/scgauss.parm
-#export TORPAR=$DD/torsion_631Gdp.parm
-#export TORDPAR=$DD/torsion_double_631Gdp.parm
-#export ELEPAR=$DD/electr_631Gdp.parm
-#export SIDEPAR=$DD/sc_GB_opt.1gab_3S_qclass5no310-shan2-sc-16-10-8k
-#export FOURIER=$DD/fourier_opt.parm.1igd_hc_iter3_3
-#export SCPPAR=$DD/scp.parm
-#export SCCORPAR=$DD/rotcorr_AM1.parm
-#export PATTERN=$DD/patterns.cart
-#-----------------------------------------------------------------------------
-#$UNRES_BIN
-#")
 
 #=========================================
-#  ala10.inp
+# Install Path
 #=========================================
+install(TARGETS UNRES_CLUSTER_WHAM_M_BIN DESTINATION ${CMAKE_INSTALL_PREFIX})
 
-#file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/ala10.inp
-#"ala10 unblocked
-#SEED=-1111333 MD ONE_LETTER rescale_mode=2 PDBOUT
-#nstep=15000 ntwe=100 ntwx=1000 dt=0.1 lang=0 tbf t_bath=300 damax=1.0          &
-#reset_moment=1000 reset_vel=1000 MDPDB
-#WLONG=1.35279 WSCP=1.59304 WELEC=0.71534 WBOND=1.00000 WANG=1.13873            &
-#WSCLOC=0.16258 WTOR=1.98599 WTORD=1.57069 WCORRH=0.42887 WCORR5=0.00000        &
-#WCORR6=0.00000 WEL_LOC=0.16036 WTURN3=1.68722 WTURN4=0.66230 WTURN6=0.00000    &
-#WVDWPP=0.11371 WHPB=1.00000                                                    &
-#CUTOFF=7.00000 WCORR4=0.00000
-#12
-#XAAAAAAAAAAX 
-# 0
-# 0
-#   90.0000   90.0000   90.0000  90.000   90.000   90.000   90.000   90.000 
-#   90.0000   90.0000
-#  180.0000  180.0000  180.0000 180.000  180.000  180.000  180.000  180.000
-#  180.0000
-#  110.0000  110.0000  110.0000 100.000  110.000  100.000  110.000  110.000 
-#  110.0000  110.0000
-# -120.0000 -120.0000 -120.000 -120.000 -120.000 -120.000 -120.000 -120.000
-# -120.0000 -120.0000
-#")
-
-
-# Add tests
-
-#if(NOT UNRES_WITH_MPI)
-
-#  add_test(NAME UNRES_MD_Ala10 COMMAND sh ${CMAKE_CURRENT_BINARY_DIR}/test_single_ala.sh )
-
-#endif(NOT UNRES_WITH_MPI)

diff --git a/source/cluster/wham/src/CMakeLists.txt b/source/cluster/wham/src/CMakeLists.txt
index 32f25a7..2436260 100644 (file)
--- a/source/cluster/wham/src/CMakeLists.txt
+++ b/source/cluster/wham/src/CMakeLists.txt
@@ -138,40 +138,21 @@ set_property(SOURCE ${UNRES_CLUSTER_WHAM_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${
 #========================================
 #  Setting binary name
 #========================================
-set(UNRES_CLUSTER_WHAM_BIN "unres_clustMD.exe")
-
-#=========================================
-# cinfo.f stupid workaround for cmake
-#  - shame on me ]:)
-#=========================================
-#set_property(SOURCE compinfo.c PROPERTY CMAKE_C_FLAGS "-c" )
-#add_executable(compinfo-wham-m compinfo.c)
-#set_target_properties(compinfo-wham-m PROPERTIES OUTPUT_NAME compinfo)
-
-#set(UNRES_CINFO_DIR "${CMAKE_CURRENT_BINARY_DIR}" )
-#add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/cinfo.f 
-#      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/cinfo.f ${CMAKE_CURRENT_BINARY_DIR}/cinfo.f
-#      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/COMMON.IOUNITS ${CMAKE_CURRENT_BINARY_DIR}/COMMON.IOUNITS 
-#      COMMAND ${CMAKE_CURRENT_BINARY_DIR}/compinfo | true     
-#      DEPENDS compinfo-wham-m )
-#set_property(SOURCE ${UNRES_CINFO_DIR}/cinfo.f PROPERTY COMPILE_FLAGS ${FFLAGS0} )
+set(UNRES_CLUSTER_WHAM_BIN "cluster_wham_${Fortran_COMPILER_NAME}.exe")
 
 set_property(SOURCE proc_proc.c PROPERTY COMPILE_DEFINITIONS "LINUX -DPGI" )  
 
-
-
 #=========================================
 # Set full unres CLUSTER sources
 #=========================================
 set(UNRES_CLUSTER_WHAM_SRCS ${UNRES_CLUSTER_WHAM_SRC0} proc_proc.c)
 
-
-
 #=========================================
 # Build the binary
 #=========================================
 add_executable(UNRES_CLUSTER_WHAM_BIN ${UNRES_CLUSTER_WHAM_SRCS} )
 set_target_properties(UNRES_CLUSTER_WHAM_BIN PROPERTIES OUTPUT_NAME ${UNRES_CLUSTER_WHAM_BIN})
+set_property(TARGET UNRES_CLUSTER_WHAM_BIN PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 
 #=========================================
 # Link libraries
@@ -184,86 +165,8 @@ endif(UNRES_WITH_MPI)
 target_link_libraries( UNRES_CLUSTER_WHAM_BIN xdrf )
 
 #=========================================
-# TESTS 
-#=========================================
-
-#-- Copy all the data files from the test directory into the source directory
-#SET(UNRES_TEST_FILES
-#      ala10.inp
-#    )
-
-#FOREACH (UNRES_TEST_FILE ${UNRES_TEST_FILES})
-#      SET (unres_test_dest "${CMAKE_CURRENT_BINARY_DIR}/${UNRES_TEST_FILE}")
-#      MESSAGE (STATUS " Copying ${UNRES_TEST_FILE} from ${CMAKE_SOURCE_DIR}/examples/unres/MD/ff_gab/${UNRES_TEST_FILE} to ${unres_test_dest}")
-#      ADD_CUSTOM_COMMAND (
-#          TARGET     ${UNRES_BIN}
-#          POST_BUILD
-#          COMMAND    ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/examples/unres/MD/ff_gab/${UNRES_TEST_FILE} ${unres_test_dest}
-#      )
-#ENDFOREACH (UNRES_TEST_FILE ${UNRES_TEST_FILES})
-
-#=========================================
-# Generate data test files
-#=========================================
-#  test_single_ala.sh
-#=========================================
-
-#FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/test_single_ala.sh
-#"#!/bin/sh
-#export POT=GB
-#export PREFIX=ala10
-#-----------------------------------------------------------------------------
-#UNRES_BIN=./${UNRES_BIN}
-#-----------------------------------------------------------------------------
-#DD=${CMAKE_SOURCE_DIR}/PARAM
-#export BONDPAR=$DD/bond.parm
-#export THETPAR=$DD/thetaml.5parm
-#export ROTPAR=$DD/scgauss.parm
-#export TORPAR=$DD/torsion_631Gdp.parm
-#export TORDPAR=$DD/torsion_double_631Gdp.parm
-#export ELEPAR=$DD/electr_631Gdp.parm
-#export SIDEPAR=$DD/sc_GB_opt.1gab_3S_qclass5no310-shan2-sc-16-10-8k
-#export FOURIER=$DD/fourier_opt.parm.1igd_hc_iter3_3
-#export SCPPAR=$DD/scp.parm
-#export SCCORPAR=$DD/rotcorr_AM1.parm
-#export PATTERN=$DD/patterns.cart
-#-----------------------------------------------------------------------------
-#$UNRES_BIN
-#")
-
+# Install Path
 #=========================================
-#  ala10.inp
-#=========================================
-
-#file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/ala10.inp
-#"ala10 unblocked
-#SEED=-1111333 MD ONE_LETTER rescale_mode=2 PDBOUT
-#nstep=15000 ntwe=100 ntwx=1000 dt=0.1 lang=0 tbf t_bath=300 damax=1.0          &
-#reset_moment=1000 reset_vel=1000 MDPDB
-#WLONG=1.35279 WSCP=1.59304 WELEC=0.71534 WBOND=1.00000 WANG=1.13873            &
-#WSCLOC=0.16258 WTOR=1.98599 WTORD=1.57069 WCORRH=0.42887 WCORR5=0.00000        &
-#WCORR6=0.00000 WEL_LOC=0.16036 WTURN3=1.68722 WTURN4=0.66230 WTURN6=0.00000    &
-#WVDWPP=0.11371 WHPB=1.00000                                                    &
-#CUTOFF=7.00000 WCORR4=0.00000
-#12
-#XAAAAAAAAAAX 
-# 0
-# 0
-#   90.0000   90.0000   90.0000  90.000   90.000   90.000   90.000   90.000 
-#   90.0000   90.0000
-#  180.0000  180.0000  180.0000 180.000  180.000  180.000  180.000  180.000
-#  180.0000
-#  110.0000  110.0000  110.0000 100.000  110.000  100.000  110.000  110.000 
-#  110.0000  110.0000
-# -120.0000 -120.0000 -120.000 -120.000 -120.000 -120.000 -120.000 -120.000
-# -120.0000 -120.0000
-#")
-
-
-# Add tests
-
-#if(NOT UNRES_WITH_MPI)
+install(TARGETS UNRES_CLUSTER_WHAM_BIN DESTINATION ${CMAKE_INSTALL_PREFIX})
 
-#  add_test(NAME UNRES_MD_Ala10 COMMAND sh ${CMAKE_CURRENT_BINARY_DIR}/test_single_ala.sh )
 
-#endif(NOT UNRES_WITH_MPI)

diff --git a/source/maxlik/src_CSA/CMakeLists.txt b/source/maxlik/src_CSA/CMakeLists.txt
index 933c70f..e80d110 100644 (file)
--- a/source/maxlik/src_CSA/CMakeLists.txt
+++ b/source/maxlik/src_CSA/CMakeLists.txt
@@ -38,7 +38,7 @@ endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 #=========================================
 # Set binary name 
 #=========================================
-set(MAXLIK_BIN "maxlik-opt-multprot")
+set(MAXLIK_BIN "maxlik_CSA")
 
 
 #=========================================
@@ -52,5 +52,10 @@ set(MAXLIK_SRCS ${MAXLIK_SRC0} )
 #=========================================
 add_executable(MAXLIK ${MAXLIK_SRCS} )
 set_target_properties(MAXLIK PROPERTIES OUTPUT_NAME ${MAXLIK_BIN})
+set_property(TARGET MAXLIK PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 
+#=========================================
+# Install Path
+#=========================================
+install(TARGETS MAXLIK DESTINATION ${CMAKE_INSTALL_PREFIX})
 

diff --git a/source/unres/src_CSA/CMakeLists.txt b/source/unres/src_CSA/CMakeLists.txt
index 445b8ac..d3db081 100644 (file)
--- a/source/unres/src_CSA/CMakeLists.txt
+++ b/source/unres/src_CSA/CMakeLists.txt
@@ -235,8 +235,7 @@ set(UNRES_CSA_SRCS ${UNRES_CSA_SRC0} ${UNRES_CSA_SRC3} ${CMAKE_CURRENT_BINARY_DI
 #=========================================
 add_executable(UNRES_BIN-CSA ${UNRES_CSA_SRCS} )
 set_target_properties(UNRES_BIN-CSA PROPERTIES OUTPUT_NAME ${UNRES_BIN})
-
-#set_property(TARGET ${UNRES_BIN} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/unres/MD )
+set_property(TARGET UNRES_BIN-CSA PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 #add_dependencies (${UNRES_BIN} ${UNRES_XDRFLIB})
 
 #=========================================
@@ -248,6 +247,12 @@ target_link_libraries( UNRES_BIN-CSA ${MPI_Fortran_LIBRARIES} )
 #target_link_libraries( ${UNRES_BIN} xdrf )
 
 #=========================================
+# Install Path
+#=========================================
+install(TARGETS UNRES_BIN-CSA DESTINATION ${CMAKE_INSTALL_PREFIX})
+
+
+#=========================================
 # TESTS 
 #=========================================
 

diff --git a/source/unres/src_CSA_DiL/CMakeLists.txt b/source/unres/src_CSA_DiL/CMakeLists.txt
index 7f4f3ab..ae64a42 100644 (file)
--- a/source/unres/src_CSA_DiL/CMakeLists.txt
+++ b/source/unres/src_CSA_DiL/CMakeLists.txt
@@ -194,7 +194,7 @@ set_property(SOURCE ${UNRES_CSA_DiL_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFL
 #========================================
 #  Setting binary name
 #========================================
-set(UNRES_BIN "unresCSA_${Fortran_COMPILER_NAME}_${UNRES_CSA_FF}_DiL.exe")
+set(UNRES_BIN "unresCSA_DiL_${Fortran_COMPILER_NAME}_${UNRES_CSA_FF}.exe")
 
 #=========================================
 # cinfo.f workaround for CMake
@@ -238,8 +238,7 @@ set(UNRES_CSA_DiL_SRCS ${UNRES_CSA_DiL_SRC0} ${UNRES_CSA_DiL_SRC3} ${CMAKE_CURRE
 #=========================================
 add_executable(UNRES_BIN-CSA-DIL ${UNRES_CSA_DiL_SRCS} )
 set_target_properties(UNRES_BIN-CSA-DIL PROPERTIES OUTPUT_NAME ${UNRES_BIN})
-
-#set_property(TARGET ${UNRES_BIN} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/unres/MD )
+set_property(TARGET UNRES_BIN-CSA-DIL PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 
 #=========================================
 # Link libraries
@@ -248,6 +247,12 @@ set_target_properties(UNRES_BIN-CSA-DIL PROPERTIES OUTPUT_NAME ${UNRES_BIN})
 target_link_libraries( UNRES_BIN-CSA-DIL ${MPI_Fortran_LIBRARIES} )
 
 #=========================================
+# Install Path
+#=========================================
+install(TARGETS UNRES_BIN-CSA-DIL DESTINATION ${CMAKE_INSTALL_PREFIX})
+
+
+#=========================================
 # TESTS 
 #=========================================
 

diff --git a/source/unres/src_MD-M/CMakeLists.txt b/source/unres/src_MD-M/CMakeLists.txt
index eed7732..ecd2b5a 100644 (file)
--- a/source/unres/src_MD-M/CMakeLists.txt
+++ b/source/unres/src_MD-M/CMakeLists.txt
@@ -256,10 +256,10 @@ set_property(SOURCE proc_proc.c PROPERTY COMPILE_DEFINITIONS "SGI" )
 #========================================
 if(UNRES_WITH_MPI) 
   # binary with mpi
-  set(UNRES_BIN "unres_${Fortran_COMPILER_NAME}_MPICH_${UNRES_MD_FF}.exe")
+  set(UNRES_BIN "unresMD-M_${Fortran_COMPILER_NAME}_MPICH_${UNRES_MD_FF}.exe")
 else(UNRES_WITH_MPI)
   # binary without mpi
-  set(UNRES_BIN "unres_${Fortran_COMPILER_NAME}_single_${UNRES_MD_FF}.exe")
+  set(UNRES_BIN "unresMD-M_${Fortran_COMPILER_NAME}_single_${UNRES_MD_FF}.exe")
 endif(UNRES_WITH_MPI)  
 
 #=========================================
@@ -304,8 +304,7 @@ set(UNRES_MDM_SRCS ${UNRES_MDM_SRC0} ${UNRES_MDM_SRC3} ${CMAKE_CURRENT_BINARY_DI
 #=========================================
 add_executable(UNRES_BIN-MD-M ${UNRES_MDM_SRCS} )
 set_target_properties(UNRES_BIN-MD-M PROPERTIES OUTPUT_NAME ${UNRES_BIN})
-
-#set_property(TARGET ${UNRES_BIN} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/unres/MD )
+set_property(TARGET UNRES_BIN-MD-M PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 #add_dependencies (${UNRES_BIN} ${UNRES_XDRFLIB})
 
 #=========================================
@@ -320,6 +319,11 @@ endif(UNRES_WITH_MPI)
 target_link_libraries( UNRES_BIN-MD-M xdrf )
 
 #=========================================
+# Install Path
+#=========================================
+install(TARGETS UNRES_BIN-MD-M DESTINATION ${CMAKE_INSTALL_PREFIX})
+
+#=========================================
 # TESTS 
 #=========================================
 

diff --git a/source/unres/src_MD/CMakeLists.txt b/source/unres/src_MD/CMakeLists.txt
index f0f1123..0b173f6 100644 (file)
--- a/source/unres/src_MD/CMakeLists.txt
+++ b/source/unres/src_MD/CMakeLists.txt
@@ -223,10 +223,10 @@ set_property(SOURCE ${UNRES_MD_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFLAGS}
 #========================================
 if(UNRES_WITH_MPI) 
   # binary with mpi
-  set(UNRES_BIN "unres_${Fortran_COMPILER_NAME}_MPICH_${UNRES_MD_FF}.exe")
+  set(UNRES_BIN "unresMD_${Fortran_COMPILER_NAME}_MPICH_${UNRES_MD_FF}.exe")
 else(UNRES_WITH_MPI)
   # binary without mpi
-  set(UNRES_BIN "unres_${Fortran_COMPILER_NAME}_single_${UNRES_MD_FF}.exe")
+  set(UNRES_BIN "unresMD_${Fortran_COMPILER_NAME}_single_${UNRES_MD_FF}.exe")
 endif(UNRES_WITH_MPI)  
 
 #=========================================
@@ -272,7 +272,7 @@ set(UNRES_MD_SRCS ${UNRES_MD_SRC0} ${UNRES_MD_SRC3} ${CMAKE_CURRENT_BINARY_DIR}/
 #=========================================
 add_executable(UNRES_BIN-MD ${UNRES_MD_SRCS} )
 set_target_properties(UNRES_BIN-MD PROPERTIES OUTPUT_NAME ${UNRES_BIN})
-#set_property(TARGET ${UNRES_BIN} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/unres/MD )
+set_property(TARGET UNRES_BIN-MD PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 #add_dependencies (${UNRES_BIN} ${UNRES_XDRFLIB})
 
 
@@ -288,6 +288,11 @@ endif(UNRES_WITH_MPI)
 target_link_libraries( UNRES_BIN-MD xdrf )
 
 #=========================================
+# Install Path
+#=========================================
+install(TARGETS UNRES_BIN-MD DESTINATION ${CMAKE_INSTALL_PREFIX}) 
+
+#=========================================
 # TESTS 
 #=========================================
 

diff --git a/source/unres/src_MIN/CMakeLists.txt b/source/unres/src_MIN/CMakeLists.txt
index 6731173..ed0bb6e 100644 (file)
--- a/source/unres/src_MIN/CMakeLists.txt
+++ b/source/unres/src_MIN/CMakeLists.txt
@@ -208,41 +208,17 @@ set(UNRES_MIN_SRCS ${UNRES_MIN_SRC0} ${UNRES_MIN_SRC1} ${UNRES_MIN_SRC2} ${UNRES
 #=========================================
 # Build the binary
 #=========================================
-add_executable(UNRES_BIN-MIN ${UNRES_MIN_SRCS} )
-set_target_properties(UNRES_BIN-MIN PROPERTIES OUTPUT_NAME ${UNRES_BIN})
+add_executable(UNRES_MIN_BIN ${UNRES_MIN_SRCS} )
+set_target_properties(UNRES_MIN_BIN PROPERTIES OUTPUT_NAME ${UNRES_BIN})
 
 if (Fortran_COMPILER_NAME STREQUAL "ifort")
-  target_link_libraries (UNRES_BIN-MIN ${CMAKE_THREAD_LIBS_INIT})
+  target_link_libraries (UNRES_MIN_BIN ${CMAKE_THREAD_LIBS_INIT})
 endif (Fortran_COMPILER_NAME STREQUAL "ifort")
+set_property(TARGET UNRES_MIN_BIN PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 
-#set_property(TARGET ${UNRES_BIN} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/unres/MD )
 
 #=========================================
-# TESTS 
+# Install Path
 #=========================================
+install(TARGETS UNRES_MIN_BIN DESTINATION ${CMAKE_INSTALL_PREFIX})
 
-#-- Copy all the data files from the test directory into the source directory
-#SET(UNRES_TEST_FILES
-#      ala10.inp
-#    )
-
-#FOREACH (UNRES_TEST_FILE ${UNRES_TEST_FILES})
-#      SET (unres_test_dest "${CMAKE_CURRENT_BINARY_DIR}/${UNRES_TEST_FILE}")
-#      MESSAGE (STATUS " Copying ${UNRES_TEST_FILE} from ${CMAKE_SOURCE_DIR}/examples/unres/MD/ff_gab/${UNRES_TEST_FILE} to ${unres_test_dest}")
-#      ADD_CUSTOM_COMMAND (
-#          TARGET     ${UNRES_BIN}
-#          POST_BUILD
-#          COMMAND    ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/examples/unres/MD/ff_gab/${UNRES_TEST_FILE} ${unres_test_dest}
-#      )
-#ENDFOREACH (UNRES_TEST_FILE ${UNRES_TEST_FILES})
-
-#=========================================
-# Generate data test files
-#=========================================
-
-#if(NOT UNRES_WITH_MPI)
-
-#  add_test(NAME UNRES_MD_Ala10 COMMAND sh ${CMAKE_CURRENT_BINARY_DIR}/test_single_ala.sh )
-
-#endif(NOT UNRES_WITH_MPI)
- 

diff --git a/source/wham/src-M/CMakeLists.txt b/source/wham/src-M/CMakeLists.txt
index 56347cf..afa0f19 100644 (file)
--- a/source/wham/src-M/CMakeLists.txt
+++ b/source/wham/src-M/CMakeLists.txt
@@ -176,7 +176,7 @@ set_property(SOURCE ${UNRES_WHAM_M_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFLA
 #========================================
 #  Setting binary name
 #========================================
-set(UNRES_WHAM_M_BIN "wham_${Fortran_COMPILER_NAME}.exe")
+set(UNRES_WHAM_M_BIN "wham_M_${Fortran_COMPILER_NAME}.exe")
 
 #=========================================
 # cinfo.f workaround for CMake
@@ -220,8 +220,7 @@ set(UNRES_WHAM_M_SRCS ${UNRES_WHAM_M_SRC0} ${CMAKE_CURRENT_BINARY_DIR}/cinfo.f p
 #=========================================
 add_executable(UNRES_WHAM_M_BIN ${UNRES_WHAM_M_SRCS} )
 set_target_properties(UNRES_WHAM_M_BIN PROPERTIES OUTPUT_NAME ${UNRES_WHAM_M_BIN})
-
-#set_property(TARGET ${UNRES_BIN} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/unres/MD )
+set_property(TARGET UNRES_WHAM_M_BIN PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 #add_dependencies (${UNRES_BIN} ${UNRES_XDRFLIB})
 
 #=========================================
@@ -232,6 +231,13 @@ target_link_libraries( UNRES_WHAM_M_BIN ${MPI_Fortran_LIBRARIES} )
 # link libxdrf.a 
 target_link_libraries( UNRES_WHAM_M_BIN xdrf )
 
+
+#=========================================
+# Install Path
+#=========================================
+install(TARGETS UNRES_WHAM_M_BIN DESTINATION ${CMAKE_INSTALL_PREFIX})
+
+
 #=========================================
 # TESTS 
 #=========================================

diff --git a/source/wham/src/CMakeLists.txt b/source/wham/src/CMakeLists.txt
index 7f49fdb..e7f990e 100644 (file)
--- a/source/wham/src/CMakeLists.txt
+++ b/source/wham/src/CMakeLists.txt
@@ -221,8 +221,7 @@ set(UNRES_WHAM_SRCS ${UNRES_WHAM_SRC0} ${CMAKE_CURRENT_BINARY_DIR}/cinfo.f proc_
 #=========================================
 add_executable(UNRES_WHAM_BIN ${UNRES_WHAM_SRCS} )
 set_target_properties(UNRES_WHAM_BIN PROPERTIES OUTPUT_NAME ${UNRES_WHAM_BIN})
-
-#set_property(TARGET ${UNRES_BIN} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/unres/MD )
+set_property(TARGET UNRES_WHAM_BIN PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 #add_dependencies (${UNRES_BIN} ${UNRES_XDRFLIB})
 
 #=========================================
@@ -234,6 +233,12 @@ target_link_libraries( UNRES_WHAM_BIN ${MPI_Fortran_LIBRARIES} )
 target_link_libraries( UNRES_WHAM_BIN xdrf )
 
 #=========================================
+# Install Path
+#=========================================
+install(TARGETS UNRES_WHAM_BIN DESTINATION ${CMAKE_INSTALL_PREFIX})
+
+
+#=========================================
 # TESTS 
 #=========================================
 

diff --git a/source/xdrfpdb/src-M/CMakeLists.txt b/source/xdrfpdb/src-M/CMakeLists.txt
index 6346acb..fcab021 100644 (file)
--- a/source/xdrfpdb/src-M/CMakeLists.txt
+++ b/source/xdrfpdb/src-M/CMakeLists.txt
@@ -61,9 +61,18 @@ set_property(SOURCE ${UNRES_XDRF_PP_SRC-M} PROPERTY COMPILE_DEFINITIONS ${CPPFLA
 #=========================================
 add_executable(UNRES_XDRF2PDB_BIN-M   ${UNRES_XDRF_XDRF2PDB_SRC-M} )
 target_link_libraries(UNRES_XDRF2PDB_BIN-M xdrf )
-set_target_properties(UNRES_XDRF2PDB_BIN-M PROPERTIES OUTPUT_NAME xdrf2pdb )
+set_target_properties(UNRES_XDRF2PDB_BIN-M PROPERTIES OUTPUT_NAME xdrf-M2pdb )
+set_property(TARGET UNRES_XDRF2PDB_BIN-M PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 
 add_executable(UNRES_XDRF2PDBM_BIN-M ${UNRES_XDRF_XDRF2PDB-M_SRC-M} )
 target_link_libraries( UNRES_XDRF2PDBM_BIN-M xdrf )
-set_target_properties(UNRES_XDRF2PDBM_BIN-M PROPERTIES OUTPUT_NAME xdrf2pdb-m )
+set_target_properties(UNRES_XDRF2PDBM_BIN-M PROPERTIES OUTPUT_NAME xdrf-M2pdb-m )
+set_property(TARGET UNRES_XDRF2PDBM_BIN-M PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
+
+
+#=========================================
+# Install Path
+#=========================================
+install(TARGETS UNRES_XDRF2PDB_BIN-M DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(TARGETS UNRES_XDRF2PDBM_BIN-M DESTINATION ${CMAKE_INSTALL_PREFIX})
 

diff --git a/source/xdrfpdb/src/CMakeLists.txt b/source/xdrfpdb/src/CMakeLists.txt
index fbe654c..b4195e5 100644 (file)
--- a/source/xdrfpdb/src/CMakeLists.txt
+++ b/source/xdrfpdb/src/CMakeLists.txt
@@ -74,19 +74,32 @@ set_property(SOURCE ${UNRES_XDRF_PP_SRC} PROPERTY COMPILE_DEFINITIONS ${CPPFLAGS
 # Build the binaries
 #=========================================
 add_executable(xdrf2pdb   ${UNRES_XDRF_XDRF2PDB_SRC} )
+set_property(TARGET xdrf2pdb PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 target_link_libraries( xdrf2pdb xdrf )
 
 add_executable(xdrf2pdb-m ${UNRES_XDRF_XDRF2PDB-M_SRC} )
+set_property(TARGET xdrf2pdb-m PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 target_link_libraries( xdrf2pdb-m xdrf )
 
 add_executable(xdrf2x     ${UNRES_XDRF_XDRF2X_SRC} )
+set_property(TARGET xdrf2x PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 target_link_libraries( xdrf2x xdrf )
 
 add_executable(xdrf2ang   ${UNRES_XDRF_XDRF2XANG_SRC} )
+set_property(TARGET xdrf2ang PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin )
 target_link_libraries( xdrf2ang xdrf )
 
 
 #=========================================
+# Install Path
+#=========================================
+install(TARGETS xdrf2pdb DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(TARGETS xdrf2pdb-m DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(TARGETS xdrf2x DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(TARGETS xdrf2ang DESTINATION ${CMAKE_INSTALL_PREFIX})
+
+
+#=========================================
 # TESTS
 #=========================================