From: Dawid Jagiela Date: Wed, 6 May 2015 18:56:05 +0000 (+0200) Subject: fixed install binary paths X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=commitdiff_plain;h=011f9a16683bb48096837601ff7136a747e01981 fixed install binary paths --- diff --git a/bin/xdrf2ang b/bin/xdrf2ang index 5126797..e5941bf 100755 Binary files a/bin/xdrf2ang and b/bin/xdrf2ang differ diff --git a/bin/xdrf2pdb b/bin/xdrf2pdb index 7771fcd..a8d6aba 100755 Binary files a/bin/xdrf2pdb and b/bin/xdrf2pdb differ diff --git a/bin/xdrf2pdb-m b/bin/xdrf2pdb-m index d3f7fde..3b6aef8 100755 Binary files a/bin/xdrf2pdb-m and b/bin/xdrf2pdb-m differ diff --git a/source/cluster/unres/src/CMakeLists.txt b/source/cluster/unres/src/CMakeLists.txt index ddd1c95..26a6b4d 100644 --- 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(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 81026b1..5597466 100644 --- a/source/cluster/wham/src-M/CMakeLists.txt +++ b/source/cluster/wham/src-M/CMakeLists.txt @@ -167,5 +167,5 @@ target_link_libraries( UNRES_CLUSTER_WHAM_M_BIN xdrf ) #========================================= # 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 d39b3c6..a05c0cc 100644 --- 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(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 d3db081..5b8d334 100644 --- a/source/unres/src_CSA/CMakeLists.txt +++ b/source/unres/src_CSA/CMakeLists.txt @@ -249,7 +249,7 @@ target_link_libraries( UNRES_BIN-CSA ${MPI_Fortran_LIBRARIES} ) #========================================= # 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 0a82f1e..06242b7 100644 --- a/source/unres/src_MD-M/CMakeLists.txt +++ b/source/unres/src_MD-M/CMakeLists.txt @@ -324,7 +324,7 @@ target_link_libraries( UNRES_BIN-MD-M xdrf ) #========================================= # 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 diff --git a/source/unres/src_MD/CMakeLists.txt b/source/unres/src_MD/CMakeLists.txt index 0cec201..052a7c9 100644 --- a/source/unres/src_MD/CMakeLists.txt +++ b/source/unres/src_MD/CMakeLists.txt @@ -301,7 +301,7 @@ target_link_libraries( UNRES_BIN-MD xdrf ) #========================================= # Install Path #========================================= -install(TARGETS UNRES_BIN-MD DESTINATION ${CMAKE_INSTALL_PREFIX}) +install(TARGETS UNRES_BIN-MD DESTINATION ${CMAKE_INSTALL_PREFIX}/unres/MD) #========================================= # TESTS diff --git a/source/unres/src_MIN/CMakeLists.txt b/source/unres/src_MIN/CMakeLists.txt index 5d8442f..079f58c 100644 --- a/source/unres/src_MIN/CMakeLists.txt +++ b/source/unres/src_MIN/CMakeLists.txt @@ -221,5 +221,5 @@ set_property(TARGET UNRES_MIN_BIN PROPERTY RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINA #========================================= # 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 cc5e2c3..3228a13 100644 --- a/source/wham/src-M/CMakeLists.txt +++ b/source/wham/src-M/CMakeLists.txt @@ -239,7 +239,7 @@ target_link_libraries( UNRES_WHAM_M_BIN xdrf ) #========================================= # 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 3422cde..9f3df87 100644 --- a/source/wham/src/CMakeLists.txt +++ b/source/wham/src/CMakeLists.txt @@ -238,7 +238,7 @@ target_link_libraries( UNRES_WHAM_BIN xdrf ) #========================================= # 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 --- 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(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 ba946f4..2b3e1f1 100644 --- a/source/xdrfpdb/src/CMakeLists.txt +++ b/source/xdrfpdb/src/CMakeLists.txt @@ -93,10 +93,10 @@ 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}) +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) #=========================================