Permalink
Browse files

moved phy_megamerge to c++11 section (because it didn't compile on os…

…x...)
  • Loading branch information...
1 parent a0ac782 commit 3cfa9cbe5fe4a3f97fd37a532eed2b26a31933a8 @sim82 committed Jan 31, 2013
Showing with 4 additions and 2 deletions.
  1. +4 −2 CMakeLists.txt
View
6 CMakeLists.txt
@@ -69,12 +69,10 @@ add_executable(papara papara2_main.cpp ${ALL_HEADERS})
add_executable(fasta_random_sample2 fasta_random_sample2.cpp ${ALL_HEADERS})
add_executable(fasta_to_phy fasta_to_phy.cpp ${ALL_HEADERS})
add_executable(phy_to_fasta phy_to_fasta.cpp ${ALL_HEADERS})
-add_executable(phy_megamerge phy_megamerge.cpp ${ALL_HEADERS})
target_link_libraries(papara papara_core ivymike ublas_jama ${SYSDEP_LIBS} )
target_link_libraries(phy_to_fasta ivymike ${SYSDEP_LIBS} )
-target_link_libraries(phy_megamerge ivymike ${SYSDEP_LIBS} )
add_executable(phy_cut_partition phy_cut_partition.cpp ${ALL_HEADERS})
@@ -86,6 +84,10 @@ if( USE_CPP11 )
add_executable(propara propara.cpp pvec.cpp raxml_interface.cpp tree_similarity.cpp parsimony.cpp )
add_executable(dump_anc_probs dump_anc_probs.cpp raxml_interface.cpp tree_similarity.cpp )
+ add_executable(phy_megamerge phy_megamerge.cpp ${ALL_HEADERS})
+ target_link_libraries(phy_megamerge ivymike ${SYSDEP_LIBS} )
+
+
target_link_libraries(stepwise_addition_pro ivymike ${BOOST_LIBS} ${SYSDEP_LIBS} PocoFoundation ublas_jama)
target_link_libraries(propara papara_core ivymike ${BOOST_LIBS} ${SYSDEP_LIBS} PocoFoundation ublas_jama)
target_link_libraries(dump_anc_probs ivymike ublas_jama ${BOOST_LIBS} ${SYSDEP_LIBS} PocoFoundation)

0 comments on commit 3cfa9cb

Please sign in to comment.