diff options
| -rw-r--r-- | Modules/FindGDAL.cmake | 3 | ||||
| -rw-r--r-- | Modules/FindGIF.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindOpenThreads.cmake | 3 | ||||
| -rw-r--r-- | Modules/Findosg_functions.cmake | 3 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 | ||||
| -rw-r--r-- | Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake | 6 | ||||
| -rw-r--r-- | Tests/CMakeTests/StringTest.cmake.in | 2 | ||||
| -rw-r--r-- | Tests/Contracts/PLplot/CMakeLists.txt | 2 |
8 files changed, 17 insertions, 6 deletions
diff --git a/Modules/FindGDAL.cmake b/Modules/FindGDAL.cmake index ceb8eee..2b940b0 100644 --- a/Modules/FindGDAL.cmake +++ b/Modules/FindGDAL.cmake @@ -49,6 +49,7 @@ find_path(GDAL_INCLUDE_DIR gdal.h PATH_SUFFIXES include/gdal include/GDAL + include ) if(UNIX) @@ -60,6 +61,7 @@ if(UNIX) HINTS ENV GDAL_DIR ENV GDAL_ROOT + PATH_SUFFIXES bin ) if(GDAL_CONFIG) @@ -79,6 +81,7 @@ find_library(GDAL_LIBRARY ENV GDAL_DIR ENV GDAL_ROOT ${_gdal_libpath} + PATH_SUFFIXES lib ) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) diff --git a/Modules/FindGIF.cmake b/Modules/FindGIF.cmake index 4b2f882..efc3973 100644 --- a/Modules/FindGIF.cmake +++ b/Modules/FindGIF.cmake @@ -30,6 +30,7 @@ find_path(GIF_INCLUDE_DIR gif_lib.h HINTS ENV GIF_DIR + PATH_SUFFIXES include ) # the gif library can have many names :-/ @@ -39,6 +40,7 @@ find_library(GIF_LIBRARY NAMES ${POTENTIAL_GIF_LIBS} HINTS ENV GIF_DIR + PATH_SUFFIXES lib ) # see readme.txt diff --git a/Modules/FindOpenThreads.cmake b/Modules/FindOpenThreads.cmake index b1b116a..a197e4d 100644 --- a/Modules/FindOpenThreads.cmake +++ b/Modules/FindOpenThreads.cmake @@ -58,6 +58,7 @@ find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread ENV OSG_ROOT ${OPENTHREADS_DIR} ${OSG_DIR} + PATH_SUFFIXES include ) @@ -73,6 +74,7 @@ find_library(OPENTHREADS_LIBRARY ENV OSG_ROOT ${OPENTHREADS_DIR} ${OSG_DIR} + PATH_SUFFIXES lib ) find_library(OPENTHREADS_LIBRARY_DEBUG @@ -88,6 +90,7 @@ find_library(OPENTHREADS_LIBRARY_DEBUG ENV OSG_ROOT ${OPENTHREADS_DIR} ${OSG_DIR} + PATH_SUFFIXES lib ) if(OPENTHREADS_LIBRARY_DEBUG) diff --git a/Modules/Findosg_functions.cmake b/Modules/Findosg_functions.cmake index 83d9844..60de726 100644 --- a/Modules/Findosg_functions.cmake +++ b/Modules/Findosg_functions.cmake @@ -28,6 +28,7 @@ function(OSG_FIND_PATH module header) ENV OSG_ROOT ${${module_uc}_DIR} ${OSG_DIR} + PATH_SUFFIXES include ) endfunction() @@ -47,6 +48,7 @@ function(OSG_FIND_LIBRARY module library) ENV OSG_ROOT ${${module_uc}_DIR} ${OSG_DIR} + PATH_SUFFIXES lib ) find_library(${module_uc}_LIBRARY_DEBUG @@ -58,6 +60,7 @@ function(OSG_FIND_LIBRARY module library) ENV OSG_ROOT ${${module_uc}_DIR} ${OSG_DIR} + PATH_SUFFIXES lib ) if(NOT ${module_uc}_LIBRARY_DEBUG) diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index f1fdb60..307b65d 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 11) -set(CMake_VERSION_PATCH 20180226) +set(CMake_VERSION_PATCH 20180228) #set(CMake_VERSION_RC 1) diff --git a/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake b/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake index a93e7f5..43c9384 100644 --- a/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake +++ b/Tests/CMakeTests/String-TIMESTAMP-UnixTime.cmake @@ -11,12 +11,12 @@ string(TIMESTAMP days "%j" UTC) # see if we are somewhere in the right region. math(EXPR years_since_epoch "${year} - 1970") -math(EXPR lower_bound "((${years_since_epoch} * 365) + ${days}) * 86400") +math(EXPR lower_bound "((${years_since_epoch} * 365) + ${days} - 1) * 86400") math(EXPR upper_bound "((${years_since_epoch} * 366) + ${days}) * 86400") -if(unix_time GREATER lower_bound AND unix_time LESS upper_bound) +if(unix_time GREATER_EQUAL lower_bound AND unix_time LESS upper_bound) message("~${unix_time}~") else() - message(FATAL_ERROR "${timestamp} unix time not in expected range [${lower_bound}, ${upper_bound}]") + message(FATAL_ERROR "${timestamp} unix time not in expected range [${lower_bound}, ${upper_bound})") endif() diff --git a/Tests/CMakeTests/StringTest.cmake.in b/Tests/CMakeTests/StringTest.cmake.in index 83655da..566f4b1 100644 --- a/Tests/CMakeTests/StringTest.cmake.in +++ b/Tests/CMakeTests/StringTest.cmake.in @@ -47,7 +47,7 @@ set(TIMESTAMP-AllSpecifiers-STDERR "~[0-9]+(;[0-9]+)*~") set(TIMESTAMP-MonthWeekNames-RESULT 0) set(TIMESTAMP-MonthWeekNames-STDERR "~[^%]+;[^%]+~") set(TIMESTAMP-UnixTime-RESULT 0) -set(TIMESTAMP-UnixTime-STDERR "~[1-9][0-9]+~") +set(TIMESTAMP-UnixTime-STDERR "~[0-9]+~") include("@CMAKE_CURRENT_SOURCE_DIR@/CheckCMakeTest.cmake") check_cmake_test(String diff --git a/Tests/Contracts/PLplot/CMakeLists.txt b/Tests/Contracts/PLplot/CMakeLists.txt index b87b4c3..7051d62 100644 --- a/Tests/Contracts/PLplot/CMakeLists.txt +++ b/Tests/Contracts/PLplot/CMakeLists.txt @@ -9,7 +9,7 @@ if(NOT PLplot_GIT_TAG) set(PLplot_GIT_TAG "plplot-5.13.0") endif() ExternalProject_Add(PLplot - GIT_REPOSITORY "https://git.code.sf.net/p/plplot/plplot.git" + GIT_REPOSITORY "git://git.code.sf.net/p/plplot/plplot" GIT_TAG "${PLplot_GIT_TAG}" PREFIX "${PLplot_PREFIX}" CMAKE_ARGS |