fixed install binary paths

Conflicts:

	bin/xdrf2ang
	bin/xdrf2pdb
	bin/xdrf2pdb-m
	source/xdrfpdb/src/CMakeLists.txt

diff --git a/source/cluster/unres/src/CMakeLists.txt b/source/cluster/unres/src/CMakeLists.txt
index 389c3d1..b2e945e 100644 (file)
--- a/source/cluster/unres/src/CMakeLists.txt
+++ b/source/cluster/unres/src/CMakeLists.txt
@@ -89,5 +89,5 @@ set_property(TARGET UNRES_CLUSTER_BIN PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_
 #=========================================
 # Install Path
 #=========================================
 #=========================================
 # Install Path
 #=========================================

-install(TARGETS UNRES_CLUSTER_BIN DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(TARGETS UNRES_CLUSTER_BIN DESTINATION ${CMAKE_INSTALL_PREFIX}/cluster)

 
 

diff --git a/source/cluster/wham/src-M/CMakeLists.txt b/source/cluster/wham/src-M/CMakeLists.txt
index 2ce99e2..c85a6b7 100644 (file)
--- a/source/cluster/wham/src-M/CMakeLists.txt
+++ b/source/cluster/wham/src-M/CMakeLists.txt
@@ -166,5 +166,5 @@ target_link_libraries( UNRES_CLUSTER_WHAM_M_BIN xdrf )
 #=========================================
 # Install Path
 #=========================================
 #=========================================
 # Install Path
 #=========================================

-install(TARGETS UNRES_CLUSTER_WHAM_M_BIN DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(TARGETS UNRES_CLUSTER_WHAM_M_BIN DESTINATION ${CMAKE_INSTALL_PREFIX}/cluster)

 
 

diff --git a/source/cluster/wham/src/CMakeLists.txt b/source/cluster/wham/src/CMakeLists.txt
index 2436260..7b6695b 100644 (file)
--- a/source/cluster/wham/src/CMakeLists.txt
+++ b/source/cluster/wham/src/CMakeLists.txt
@@ -167,6 +167,6 @@ target_link_libraries( UNRES_CLUSTER_WHAM_BIN xdrf )
 #=========================================
 # Install Path
 #=========================================
 #=========================================
 # Install Path
 #=========================================

-install(TARGETS UNRES_CLUSTER_WHAM_BIN DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(TARGETS UNRES_CLUSTER_WHAM_BIN DESTINATION ${CMAKE_INSTALL_PREFIX}/cluster)

 
 
 
 

diff --git a/source/unres/src_CSA/CMakeLists.txt b/source/unres/src_CSA/CMakeLists.txt
index b297d98..1ae7730 100644 (file)
--- a/source/unres/src_CSA/CMakeLists.txt
+++ b/source/unres/src_CSA/CMakeLists.txt
@@ -250,7 +250,7 @@ target_link_libraries( UNRES_BIN-CSA ${MPI_Fortran_LIBRARIES} )
 #=========================================
 # Install Path
 #=========================================
 #=========================================
 # Install Path
 #=========================================

-install(TARGETS UNRES_BIN-CSA DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(TARGETS UNRES_BIN-CSA DESTINATION ${CMAKE_INSTALL_PREFIX}/unres/CSA)

 
 
 #=========================================
 
 
 #=========================================

diff --git a/source/unres/src_MD-M/CMakeLists.txt b/source/unres/src_MD-M/CMakeLists.txt
index ecd2b5a..171fa3f 100644 (file)
--- a/source/unres/src_MD-M/CMakeLists.txt
+++ b/source/unres/src_MD-M/CMakeLists.txt
@@ -321,7 +321,7 @@ target_link_libraries( UNRES_BIN-MD-M xdrf )
 #=========================================
 # Install Path
 #=========================================
 #=========================================
 # Install Path
 #=========================================

-install(TARGETS UNRES_BIN-MD-M DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(TARGETS UNRES_BIN-MD-M DESTINATION ${CMAKE_INSTALL_PREFIX}/unres/MD)

 
 #=========================================
 # TESTS 
 
 #=========================================
 # TESTS 

diff --git a/source/unres/src_MD/CMakeLists.txt b/source/unres/src_MD/CMakeLists.txt
index c210fdc..3d97d54 100644 (file)
--- a/source/unres/src_MD/CMakeLists.txt
+++ b/source/unres/src_MD/CMakeLists.txt
@@ -290,7 +290,7 @@ target_link_libraries( UNRES_BIN-MD xdrf )
 #=========================================
 # Install Path
 #=========================================
 #=========================================
 # Install Path
 #=========================================

-install(TARGETS UNRES_BIN-MD DESTINATION ${CMAKE_INSTALL_PREFIX}) 
+install(TARGETS UNRES_BIN-MD DESTINATION ${CMAKE_INSTALL_PREFIX}/unres/MD) 

 
 #=========================================
 # TESTS 
 
 #=========================================
 # TESTS 

diff --git a/source/unres/src_MIN/CMakeLists.txt b/source/unres/src_MIN/CMakeLists.txt
index d8eb8de..485a7e7 100644 (file)
--- a/source/unres/src_MIN/CMakeLists.txt
+++ b/source/unres/src_MIN/CMakeLists.txt
@@ -220,5 +220,5 @@ set_property(TARGET UNRES_MIN_BIN PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINA
 #=========================================
 # Install Path
 #=========================================
 #=========================================
 # Install Path
 #=========================================

-install(TARGETS UNRES_MIN_BIN DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(TARGETS UNRES_MIN_BIN DESTINATION ${CMAKE_INSTALL_PREFIX}/unres/MINIM)

 
 

diff --git a/source/wham/src-M/CMakeLists.txt b/source/wham/src-M/CMakeLists.txt
index afa0f19..0d562eb 100644 (file)
--- a/source/wham/src-M/CMakeLists.txt
+++ b/source/wham/src-M/CMakeLists.txt
@@ -235,7 +235,7 @@ target_link_libraries( UNRES_WHAM_M_BIN xdrf )
 #=========================================
 # Install Path
 #=========================================
 #=========================================
 # Install Path
 #=========================================

-install(TARGETS UNRES_WHAM_M_BIN DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(TARGETS UNRES_WHAM_M_BIN DESTINATION ${CMAKE_INSTALL_PREFIX}/wham)

 
 
 #=========================================
 
 
 #=========================================

diff --git a/source/wham/src/CMakeLists.txt b/source/wham/src/CMakeLists.txt
index e7f990e..09848db 100644 (file)
--- a/source/wham/src/CMakeLists.txt
+++ b/source/wham/src/CMakeLists.txt
@@ -235,7 +235,7 @@ target_link_libraries( UNRES_WHAM_BIN xdrf )
 #=========================================
 # Install Path
 #=========================================
 #=========================================
 # Install Path
 #=========================================

-install(TARGETS UNRES_WHAM_BIN DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(TARGETS UNRES_WHAM_BIN DESTINATION ${CMAKE_INSTALL_PREFIX}/wham)

 
 
 #=========================================
 
 
 #=========================================

diff --git a/source/xdrfpdb/src-M/CMakeLists.txt b/source/xdrfpdb/src-M/CMakeLists.txt
index fcab021..49748e2 100644 (file)
--- a/source/xdrfpdb/src-M/CMakeLists.txt
+++ b/source/xdrfpdb/src-M/CMakeLists.txt
@@ -73,6 +73,6 @@ set_property(TARGET UNRES_XDRF2PDBM_BIN-M PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CM
 #=========================================
 # Install Path
 #=========================================
 #=========================================
 # Install Path
 #=========================================

-install(TARGETS UNRES_XDRF2PDB_BIN-M DESTINATION ${CMAKE_INSTALL_PREFIX})
-install(TARGETS UNRES_XDRF2PDBM_BIN-M DESTINATION ${CMAKE_INSTALL_PREFIX})
+install(TARGETS UNRES_XDRF2PDB_BIN-M DESTINATION ${CMAKE_INSTALL_PREFIX}/xdrfpdb)
+install(TARGETS UNRES_XDRF2PDBM_BIN-M DESTINATION ${CMAKE_INSTALL_PREFIX}/xdrfpdb)

 
 

diff --git a/source/xdrfpdb/src/CMakeLists.txt b/source/xdrfpdb/src/CMakeLists.txt
index b4195e5..3935bc9 100644 (file)
--- a/source/xdrfpdb/src/CMakeLists.txt
+++ b/source/xdrfpdb/src/CMakeLists.txt
@@ -93,10 +93,10 @@ target_link_libraries( xdrf2ang xdrf )
 #=========================================
 # Install Path
 #=========================================
 #=========================================
 # 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})
+install(TARGETS xdrf2pdb       DESTINATION ${CMAKE_INSTALL_PREFIX}/xdrfpdb)
+install(TARGETS xdrf2pdb-m     DESTINATION ${CMAKE_INSTALL_PREFIX}/xdrfpdb)
+install(TARGETS xdrf2x         DESTINATION ${CMAKE_INSTALL_PREFIX}/xdrfpdb)
+install(TARGETS xdrf2ang       DESTINATION ${CMAKE_INSTALL_PREFIX}/xdrfpdb)

 
 
 #=========================================
 
 
 #=========================================