File tree Expand file tree Collapse file tree 8 files changed +31
-18
lines changed Expand file tree Collapse file tree 8 files changed +31
-18
lines changed Original file line number Diff line number Diff line change 4
4
MACRO (FIND_BISON )
5
5
IF (NOT BISON_EXECUTABLE )
6
6
IF (MSVC )
7
- FIND_PROGRAM (BISON_EXECUTABLE "c:/dev/cpp/bison /bin/bison.exe" )
7
+ FIND_PROGRAM (BISON_EXECUTABLE "$ENV{LIB_DIR} /bin/bison.exe" )
8
8
ELSE (MSVC )
9
9
FIND_PROGRAM (BISON_EXECUTABLE bison )
10
10
ENDIF (MSVC )
Original file line number Diff line number Diff line change 11
11
FIND_PATH (EXPAT_INCLUDE_DIR expat.h
12
12
/usr/local/include
13
13
/usr/include
14
+ "$ENV{LIB_DIR} /include/expat"
14
15
c:/msys/local/include
15
- "C:/dev/cpp/Expat 2.0.1/Source/Lib"
16
16
)
17
17
#libexpat needed for msvc version
18
18
FIND_LIBRARY (EXPAT_LIBRARY NAMES expat libexpat PATHS
19
19
/usr/local/lib
20
20
/usr/lib
21
+ "$ENV{LIB_DIR} /lib"
21
22
c:/msys/local/lib
22
- "C:/dev/cpp/Expat 2.0.1/Bin"
23
23
)
24
24
25
25
IF (EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY )
Original file line number Diff line number Diff line change @@ -17,8 +17,15 @@ IF(WIN32)
17
17
ENDIF (MINGW )
18
18
19
19
IF (MSVC )
20
- SET (GDAL_INCLUDE_DIR C:/dev/cpp/gdal/gcore;C:/dev/cpp/gdal/port;C:/dev/cpp/gdal/ogr;C:/dev/cpp/gdal/alg;C:/dev/cpp/gdal/ogr/ogrsf_frmts CACHE STRING INTERNAL )
21
- SET (GDAL_LIBRARY C:/dev/cpp/gdal/gdal.lib;odbc32;odbccp32 CACHE STRING INTERNAL )
20
+ SET (
21
+ GDAL_INCLUDE_DIR
22
+ "$ENV{LIB_DIR} /include/gdal"
23
+ CACHE STRING INTERNAL
24
+ )
25
+ SET (
26
+ GDAL_LIBRARY
27
+ "$ENV{LIB_DIR} /lib/gdal.lib" ;odbc32;odbccp32
28
+ CACHE STRING INTERNAL )
22
29
ENDIF (MSVC )
23
30
24
31
Original file line number Diff line number Diff line change 10
10
FIND_PATH (GEOS_INCLUDE_DIR geos.h
11
11
/usr/local/include
12
12
/usr/include
13
- c:/msys/local/include
14
13
#MSVC
15
- C:/dev/cpp/geos-2.2.1/source/headers
14
+ "$ENV{LIB_DIR} /include"
15
+ #mingw
16
+ c:/msys/local/include
16
17
)
17
18
18
19
FIND_LIBRARY (GEOS_LIBRARY NAMES geos PATHS
19
20
/usr/local/lib
20
21
/usr/lib
21
- c:/msys/local/lib
22
22
#MSVC
23
- C:/dev/cpp/geos-2.2.1/source
23
+ "$ENV{LIB_DIR} /lib"
24
+ #mingw
25
+ c:/msys/local/lib
24
26
)
25
27
26
28
IF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY )
Original file line number Diff line number Diff line change 26
26
IF (WIN32 )
27
27
28
28
SET (GSL_MINGW_PREFIX "c:/msys/local" )
29
- SET (GSL_MSVC_PREFIX "C:/dev/cpp/gsl" )
30
-
29
+ SET (GSL_MSVC_PREFIX "$ENV{LIB_DIR} " )
31
30
FIND_LIBRARY (GSL_LIB gsl PATHS
32
31
${GSL_MINGW_PREFIX} /lib
33
32
${GSL_MSVC_PREFIX} /lib
@@ -38,7 +37,7 @@ IF(WIN32)
38
37
${GSL_MSVC_PREFIX} /lib
39
38
)
40
39
41
- FIND_PATH (GSL_INCLUDE_DIR gsl/gsl_version .h
40
+ FIND_PATH (GSL_INCLUDE_DIR gsl/gsl_blas .h
42
41
${GSL_PREFIX} /include
43
42
${GSL_MSVC_PREFIX} /include
44
43
)
Original file line number Diff line number Diff line change 10
10
FIND_PATH (PROJ_INCLUDE_DIR proj_api.h
11
11
/usr/local/include
12
12
/usr/include
13
+ #msvc
14
+ "$ENV{LIB_DIR} /include/proj"
15
+ #mingw
13
16
c:/msys/local/include
14
- C:/dev/cpp/proj-4.5.0/src
15
17
)
16
18
17
19
FIND_LIBRARY (PROJ_LIBRARY NAMES proj PATHS
18
20
/usr/local/lib
19
21
/usr/lib
22
+ "$ENV{LIB_DIR} /lib"
20
23
c:/msys/local/lib
21
- C:/dev/cpp/proj-4.5.0/src
22
24
)
23
25
24
26
IF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY )
Original file line number Diff line number Diff line change 10
10
FIND_PATH (SQLITE3_INCLUDE_DIR sqlite3.h
11
11
/usr/local/include
12
12
/usr/include
13
- c:/msys/local/include
14
13
#msvc
15
- c:/dev/cpp/sqlite3
14
+ "$ENV{LIB_DIR} /include/sqlite"
15
+ #mingw
16
+ c:/msys/local/include
16
17
)
17
18
18
19
FIND_LIBRARY (SQLITE3_LIBRARY NAMES sqlite3 PATHS
19
20
/usr/local/lib
20
21
/usr/lib
21
22
c:/msys/local/lib
22
23
#msvc
23
- c:/dev/cpp/sqlite3
24
+ " $ENV{LIB_DIR} /lib"
24
25
)
25
26
26
27
IF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY )
Original file line number Diff line number Diff line change 4
4
MACRO (FIND_FLEX )
5
5
IF (NOT FLEX_EXECUTABLE )
6
6
IF (MSVC )
7
- FIND_PROGRAM (FLEX_EXECUTABLE "C:/dev/cpp/flex/bin/flex.exe" )
7
+ FIND_PROGRAM (FLEX_EXECUTABLE
8
+ "$ENV{LIB_DIR} /bin/flex.exe"
9
+ )
8
10
ELSE (MSVC )
9
11
FIND_PROGRAM (FLEX_EXECUTABLE flex )
10
12
ENDIF (MSVC )
You can’t perform that action at this time.
0 commit comments