Skip to content

Commit e09a0a5

Browse files
blazekblazek
committed
master merge
2 parents 53da893 + 3b3f674 commit e09a0a5

File tree

218 files changed

+11335
-4219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

218 files changed

+11335
-4219
lines changed

‎INSTALL

+276-32
Large diffs are not rendered by default.

‎cmake/Bison.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MACRO(FIND_BISON)
1212
IF (MSVC)
1313
FIND_PROGRAM(BISON_EXECUTABLE PATHS
1414
NAMES bison.exe
15-
PATHS $ENV{LIB_DIR}/bin $ENV{PROGRAMFILES}/GnuWin32/bin
15+
PATHS $ENV{LIB_DIR}/bin c:/cygwin/bin $ENV{PROGRAMFILES}/GnuWin32/bin
1616
)
1717
ELSE (MSVC)
1818
FIND_PROGRAM(BISON_EXECUTABLE bison)

‎cmake/FindFcgi.cmake

+1-7
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,14 @@ FIND_PATH(FCGI_INCLUDE_DIR
1010
/usr/include
1111
/usr/local/include
1212
/usr/include/fastcgi
13-
#MSVC
1413
"$ENV{LIB_DIR}/include"
1514
$ENV{INCLUDE}
16-
#mingw
17-
c:/msys/local/include
1815
)
1916
FIND_LIBRARY(FCGI_LIBRARY NAMES fcgi libfcgi PATHS
2017
/usr/local/lib
2118
/usr/lib
22-
#MSVC
2319
"$ENV{LIB_DIR}/lib"
24-
$ENV{LIB}
25-
#mingw
26-
c:/msys/local/lib
20+
"$ENV{LIB}"
2721
)
2822

2923
IF (FCGI_INCLUDE_DIR AND FCGI_LIBRARY)

‎cmake/FindGEOS.cmake

+1-4
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,8 @@ IF(WIN32)
2525
IF (MSVC)
2626
FIND_PATH(GEOS_INCLUDE_DIR geos_c.h $ENV{LIB_DIR}/include $ENV{INCLUDE})
2727
FIND_LIBRARY(GEOS_LIBRARY NAMES geos geos_c_i PATHS
28-
"$ENV{LIB}/lib"
28+
"$ENV{LIB_DIR}/lib"
2929
$ENV{LIB}
30-
#mingw
31-
c:/msys/local/lib
32-
NO_DEFAULT_PATH
3330
)
3431
IF (GEOS_LIBRARY)
3532
SET (

‎cmake/FindGSL.cmake

+3-10
Original file line numberDiff line numberDiff line change
@@ -23,25 +23,18 @@
2323
##
2424

2525
IF(WIN32)
26-
27-
SET(GSL_MINGW_PREFIX "c:/msys/local" )
28-
SET(GSL_MSVC_PREFIX "$ENV{LIB_DIR}")
29-
3026
FIND_PATH(GSL_INCLUDE_DIR gsl/gsl_blas.h
31-
${GSL_MINGW_PREFIX}/include
32-
${GSL_MSVC_PREFIX}/include
27+
${LIB_DIR}/include
3328
$ENV{INCLUDE}
3429
)
3530

3631
FIND_LIBRARY(GSL_LIB gsl PATHS
37-
${GSL_MINGW_PREFIX}/lib
38-
${GSL_MSVC_PREFIX}/lib
32+
${LIB_DIR}/lib
3933
$ENV{LIB}
4034
)
4135

4236
FIND_LIBRARY(GSLCBLAS_LIB gslcblas cblas PATHS
43-
${GSL_MINGW_PREFIX}/lib
44-
${GSL_MSVC_PREFIX}/lib
37+
${LIB_DIR}/lib
4538
$ENV{LIB}
4639
)
4740

‎cmake/FindIconv.cmake

-7
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,13 @@ FIND_PATH(ICONV_INCLUDE_DIR iconv.h
2222
$ENV{INCLUDE}
2323
/usr/local/include
2424
/usr/include
25-
#mingw
26-
c:/msys/local/include
27-
NO_DEFAULT_PATH
2825
)
29-
FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
3026

3127
FIND_LIBRARY(ICONV_LIBRARY NAMES iconv libiconv PATHS
3228
"$ENV{LIB_DIR}/lib"
3329
$ENV{LIB}
3430
/usr/local/lib
3531
/usr/lib
36-
#mingw
37-
c:/msys/local/lib
38-
NO_DEFAULT_PATH
3932
)
4033

4134
IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARY)

‎cmake/FindProj.cmake

+2-9
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,14 @@ IF (APPLE)
3737
ENDIF (APPLE)
3838

3939
FIND_PATH(PROJ_INCLUDE_DIR proj_api.h
40-
"$ENV{LIB_DIR}/include/proj"
40+
"$ENV{INCLUDE}"
4141
"$ENV{LIB_DIR}/include"
42-
#mingw
43-
c:/msys/local/include
44-
NO_DEFAULT_PATH
4542
)
46-
FIND_PATH(PROJ_INCLUDE_DIR proj_api.h)
4743

4844
FIND_LIBRARY(PROJ_LIBRARY NAMES proj proj_i PATHS
45+
"$ENV{LIB}"
4946
"$ENV{LIB_DIR}/lib"
50-
#mingw
51-
c:/msys/local/lib
52-
NO_DEFAULT_PATH
5347
)
54-
FIND_LIBRARY(PROJ_LIBRARY NAMES proj)
5548

5649
IF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY)
5750
SET(PROJ_FOUND TRUE)

‎cmake/FindQwt.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ FIND_LIBRARY(QWT_LIBRARY NAMES qwt qwt5 qwt-qt4 qwt5-qt4 PATHS
2424
/usr/lib
2525
/usr/local/lib
2626
"$ENV{LIB_DIR}/lib"
27-
"$ENV{LIB}/lib"
27+
"$ENV{LIB}"
2828
)
2929

3030
IF (QWT_INCLUDE_DIR AND QWT_LIBRARY)

‎cmake/FindSPATIALITE.cmake

+5-10
Original file line numberDiff line numberDiff line change
@@ -39,21 +39,16 @@ IF (APPLE)
3939
ENDIF (APPLE)
4040

4141
FIND_PATH(SPATIALITE_INCLUDE_DIR spatialite.h
42+
"$ENV{INCLUDE}"
4243
"$ENV{LIB_DIR}/include"
4344
"$ENV{LIB_DIR}/include/spatialite"
44-
#mingw
45-
c:/msys/local/include
46-
NO_DEFAULT_PATH
4745
)
48-
FIND_PATH(SPATIALITE_INCLUDE_DIR spatialite.h)
4946

50-
FIND_LIBRARY(SPATIALITE_LIBRARY NAMES spatialite PATHS
51-
"$ENV{LIB_DIR}/lib"
52-
#mingw
53-
c:/msys/local/lib
54-
NO_DEFAULT_PATH
47+
MESSAGE(STATUS "LIB:${LIB} LIB_DIR:${LIB_DIR}")
48+
FIND_LIBRARY(SPATIALITE_LIBRARY NAMES spatialite spatialite_i PATHS
49+
$ENV{LIB}
50+
$ENV{LIB_DIR}/lib
5551
)
56-
FIND_LIBRARY(SPATIALITE_LIBRARY NAMES spatialite)
5752

5853
IF (SPATIALITE_INCLUDE_DIR AND SPATIALITE_LIBRARY)
5954
SET(SPATIALITE_FOUND TRUE)

‎cmake/FindSqlite3.cmake

+4-12
Original file line numberDiff line numberDiff line change
@@ -40,27 +40,19 @@ ENDIF (APPLE)
4040
FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h
4141
"$ENV{LIB_DIR}/include"
4242
"$ENV{LIB_DIR}/include/sqlite"
43-
#mingw
44-
c:/msys/local/include
45-
NO_DEFAULT_PATH
46-
)
47-
FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h)
43+
"$ENV{INCLUDE}"
44+
)
4845

49-
FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 sqlite3_i PATHS
46+
FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3_i sqlite3 PATHS
5047
"$ENV{LIB_DIR}/lib"
51-
#mingw
52-
c:/msys/local/lib
53-
NO_DEFAULT_PATH
48+
"$ENV{LIB}/lib"
5449
)
55-
FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3)
5650

5751
IF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
5852
SET(SQLITE3_FOUND TRUE)
5953
ENDIF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)
6054

61-
6255
IF (SQLITE3_FOUND)
63-
6456
IF (NOT SQLITE3_FIND_QUIETLY)
6557
MESSAGE(STATUS "Found Sqlite3: ${SQLITE3_LIBRARY}")
6658
ENDIF (NOT SQLITE3_FIND_QUIETLY)

‎cmake/Flex.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ MACRO(FIND_FLEX)
1212
IF (MSVC)
1313
FIND_PROGRAM(FLEX_EXECUTABLE
1414
NAMES flex.exe
15-
PATHS $ENV{LIB_DIR}/bin $ENV{PROGRAMFILES}/GnuWin32/bin
15+
PATHS $ENV{LIB_DIR}/bin c:/cygwin/bin $ENV{PROGRAMFILES}/GnuWin32/bin
1616
)
1717
ELSE(MSVC)
1818
FIND_PROGRAM(FLEX_EXECUTABLE flex)

0 commit comments

Comments
 (0)