From fe4586c995a759e138c0a3de65ee8e1b5457b7f9 Mon Sep 17 00:00:00 2001 From: Dave B Date: Thu, 17 May 2018 12:55:17 -0400 Subject: [PATCH 1/2] Honor the -DCMAKE_INSTALL_PREFIX directive --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c4ce752b..266f8b3fa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -188,8 +188,12 @@ endif(NOT ${OPENMP_FOUND}) #------------------------------------------------------------------------------- # default installation prefix #------------------------------------------------------------------------------- -set(INSTALL_PREFIX /usr/local CACHE PATH "Installation prefix") -set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX} CACHE INTERNAL "Installation prefix" FORCE) +if(NOT DEFINED CMAKE_INSTALL_PREFIX) + set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "Installation prefix") +endif() +if(NOT DEFINED INSTALL_PREFIX) + set(INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE INTERNAL "Installation prefix" FORCE) +endif() if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") set(DEFAULT_LIBRARIES pthread) else(CMAKE_SYSTEM_NAME MATCHES "FreeBSD") From 316c47ea088c764fd89da50a0544b0fe13f0584a Mon Sep 17 00:00:00 2001 From: Steven Weaver Date: Thu, 17 May 2018 17:40:30 -0400 Subject: [PATCH 2/2] Update strings.cpp --- src/core/strings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/strings.cpp b/src/core/strings.cpp index b6a152b06..efcb435c8 100644 --- a/src/core/strings.cpp +++ b/src/core/strings.cpp @@ -69,7 +69,7 @@ #define MOD_ADLER 65521 _String compileDate = __DATE__, - __HYPHY__VERSION__ = _String ("2.3.12.") & compileDate.Cut (7,10) & compileDate.Cut (0,2).Replace("Jan", "01", true). + __HYPHY__VERSION__ = _String ("2.3.13.") & compileDate.Cut (7,10) & compileDate.Cut (0,2).Replace("Jan", "01", true). Replace("Feb", "02", true). Replace("Mar", "03", true). Replace("Apr", "04", true).