@@ -81,7 +81,7 @@ endif()
8181# The version number.
8282set (iqtree_VERSION_MAJOR 2)
8383set (iqtree_VERSION_MINOR 0)
84- set (iqtree_VERSION_PATCH ".3 " )
84+ set (iqtree_VERSION_PATCH ".4 " )
8585
8686option (BUILD_SHARED_LIBS "Build Shared Libraries" OFF )
8787
@@ -599,23 +599,23 @@ add_library(kernelfma tree/phylokernelfma.cpp)
599599 endif ()
600600endif ()
601601
602- add_executable (iqtree
602+ add_executable (iqtree2
603603obsolete/parsmultistate.cpp
604604obsolete/parsmultistate.h
605605)
606606
607607if (Backtrace_FOUND)
608608 include_directories (${Backtrace_INCLUDE_DIR} )
609- target_link_libraries (iqtree ${Backtrace_LIBRARY} )
609+ target_link_libraries (iqtree2 ${Backtrace_LIBRARY} )
610610endif (Backtrace_FOUND)
611611
612612if (USE_BOOSTER)
613- target_link_libraries (iqtree booster)
613+ target_link_libraries (iqtree2 booster)
614614endif ()
615615
616616if (NOT IQTREE_FLAGS MATCHES "avx" AND NOT IQTREE_FLAGS MATCHES "fma" )
617617 if (NOT IQTREE_FLAGS MATCHES "nosse" )
618- set_target_properties (iqtree ncl nclextra utils pda lbfgsb whtest sprng vectorclass model gsl alignment tree yaml-cpp phyloYAML main PROPERTIES COMPILE_FLAGS "${SSE_FLAGS} " )
618+ set_target_properties (iqtree2 ncl nclextra utils pda lbfgsb whtest sprng vectorclass model gsl alignment tree yaml-cpp phyloYAML main PROPERTIES COMPILE_FLAGS "${SSE_FLAGS} " )
619619 if (USE_TERRAPHAST)
620620 set_target_properties (terrace terraphast PROPERTIES COMPILE_FLAGS "${SSE_FLAGS} " )
621621 endif ()
@@ -663,9 +663,9 @@ if (NOT IQTREE_FLAGS MATCHES "single")
663663 endif ()
664664 elseif (CLANG AND WIN32 )
665665 if (BINARY32)
666- target_link_libraries (iqtree ${PROJECT_SOURCE_DIR} /lib32/libiomp5md.dll)
666+ target_link_libraries (iqtree2 ${PROJECT_SOURCE_DIR} /lib32/libiomp5md.dll)
667667 else ()
668- target_link_libraries (iqtree ${PROJECT_SOURCE_DIR} /lib/libiomp5md.dll)
668+ target_link_libraries (iqtree2 ${PROJECT_SOURCE_DIR} /lib/libiomp5md.dll)
669669 endif ()
670670# set(THREAD_LIB "ompstatic")
671671 endif ()
@@ -677,46 +677,46 @@ if (NOT IQTREE_FLAGS MATCHES "single")
677677endif ()
678678
679679# basic linking librararies
680- target_link_libraries (iqtree pll ncl nclextra utils pda lbfgsb whtest sprng vectorclass model
680+ target_link_libraries (iqtree2 pll ncl nclextra utils pda lbfgsb whtest sprng vectorclass model
681681 gsl alignment tree yaml-cpp phyloYAML main ${PLATFORM_LIB} ${STD_LIB} ${THREAD_LIB} ${ATOMIC_LIB} )
682682
683683if (USE_TERRAPHAST)
684- target_link_libraries (iqtree terrace)
684+ target_link_libraries (iqtree2 terrace)
685685endif ()
686686
687687if (USE_LSD2)
688- target_link_libraries (iqtree lsd2)
688+ target_link_libraries (iqtree2 lsd2)
689689endif ()
690690
691691if (NOT IQTREE_FLAGS MATCHES "nosse" )
692- target_link_libraries (iqtree kernelsse)
692+ target_link_libraries (iqtree2 kernelsse)
693693endif ()
694694
695695# MPI libraries
696696if (IQTREE_FLAGS MATCHES "mpi" )
697697 if (NOT CMAKE_CXX_COMPILER MATCHES "mpi" )
698- target_link_libraries (iqtree ${MPI_CXX_LIBRARIES} )
698+ target_link_libraries (iqtree2 ${MPI_CXX_LIBRARIES} )
699699 endif ()
700700endif ()
701701
702702# SSE, AVX etc. libraries
703703if (NOT BINARY32 AND NOT IQTREE_FLAGS MATCHES "novx" )
704- target_link_libraries (iqtree pllavx kernelavx kernelfma)
704+ target_link_libraries (iqtree2 pllavx kernelavx kernelfma)
705705 if (IQTREE_FLAGS MATCHES "KNL" )
706- target_link_libraries (iqtree kernelavx512)
706+ target_link_libraries (iqtree2 kernelavx512)
707707 endif ()
708708endif ()
709709
710710# setup the executable name
711711##################################################################
712- set_target_properties (iqtree PROPERTIES OUTPUT_NAME "iqtree ${EXE_SUFFIX} " )
712+ set_target_properties (iqtree2 PROPERTIES OUTPUT_NAME "iqtree2 ${EXE_SUFFIX} " )
713713
714714# strip the release build
715715if (NOT IQTREE_FLAGS MATCHES "nostrip" AND CMAKE_BUILD_TYPE STREQUAL "Release" AND (GCC OR CLANG) AND NOT APPLE ) # strip is not necessary for MSVC
716716 if (WIN32 )
717- ADD_CUSTOM_COMMAND (TARGET iqtree POST_BUILD COMMAND strip $<TARGET_FILE:iqtree >)
717+ ADD_CUSTOM_COMMAND (TARGET iqtree2 POST_BUILD COMMAND strip $<TARGET_FILE:iqtree2 >)
718718 elseif (NOT APPLE )
719- ADD_CUSTOM_COMMAND (TARGET iqtree POST_BUILD COMMAND strip $<TARGET_FILE:iqtree >)
719+ ADD_CUSTOM_COMMAND (TARGET iqtree2 POST_BUILD COMMAND strip $<TARGET_FILE:iqtree2 >)
720720 endif ()
721721endif ()
722722
@@ -728,23 +728,23 @@ endif()
728728
729729if (WIN32 )
730730 if (MSVC )
731- ADD_CUSTOM_COMMAND (TARGET iqtree POST_BUILD COMMAND copy "Release\\ iqtree ${EXE_SUFFIX} .exe" "Release\\ iqtree ${EXE_SUFFIX} -click.exe" )
731+ ADD_CUSTOM_COMMAND (TARGET iqtree2 POST_BUILD COMMAND copy "Release\\ iqtree2 ${EXE_SUFFIX} .exe" "Release\\ iqtree2 ${EXE_SUFFIX} -click.exe" )
732732 else ()
733- ADD_CUSTOM_COMMAND (TARGET iqtree POST_BUILD COMMAND copy "iqtree ${EXE_SUFFIX} .exe" "iqtree ${EXE_SUFFIX} -click.exe" )
733+ ADD_CUSTOM_COMMAND (TARGET iqtree2 POST_BUILD COMMAND copy "iqtree2 ${EXE_SUFFIX} .exe" "iqtree2 ${EXE_SUFFIX} -click.exe" )
734734 endif ()
735735endif ()
736736
737737##############################################################
738738# add the install targets
739739##############################################################
740- install (TARGETS iqtree DESTINATION bin)
740+ install (TARGETS iqtree2 DESTINATION bin)
741741install (FILES "${PROJECT_SOURCE_DIR} /example/models.nex" DESTINATION .)
742742install (FILES "${PROJECT_SOURCE_DIR} /example/example.phy" DESTINATION .)
743743install (FILES "${PROJECT_SOURCE_DIR} /example/example.nex" DESTINATION .)
744744install (FILES "${PROJECT_SOURCE_DIR} /example/example.cf" DESTINATION .)
745745
746746if (WIN32 )
747- install (FILES "${BINARY_DIR} /iqtree ${EXE_SUFFIX} -click.exe" DESTINATION bin)
747+ install (FILES "${BINARY_DIR} /iqtree2 ${EXE_SUFFIX} -click.exe" DESTINATION bin)
748748 if (NOT IQTREE_FLAGS MATCHES "single" AND MSVC )
749749 if (BINARY32)
750750 install (FILES "${PROJECT_SOURCE_DIR} /lib32/pthreadVC2.dll" DESTINATION bin)
0 commit comments