Skip to content

Commit cb18a80

Browse files
author
timlinux
committedOct 11, 2007
For msvc cmake rules make all the include, app and lib paths relative to the environment dir %LIB_DIR% so that the libs can be anywhere on your filesystem.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7261 c8812cc2-4d05-0410-92ff-de0c093fc19c

File tree

8 files changed

+31
-18
lines changed

8 files changed

+31
-18
lines changed
 

‎cmake/Bison.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
MACRO(FIND_BISON)
55
IF(NOT BISON_EXECUTABLE)
66
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")
88
ELSE (MSVC)
99
FIND_PROGRAM(BISON_EXECUTABLE bison)
1010
ENDIF (MSVC)

‎cmake/FindExpat.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
FIND_PATH(EXPAT_INCLUDE_DIR expat.h
1212
/usr/local/include
1313
/usr/include
14+
"$ENV{LIB_DIR}/include/expat"
1415
c:/msys/local/include
15-
"C:/dev/cpp/Expat 2.0.1/Source/Lib"
1616
)
1717
#libexpat needed for msvc version
1818
FIND_LIBRARY(EXPAT_LIBRARY NAMES expat libexpat PATHS
1919
/usr/local/lib
2020
/usr/lib
21+
"$ENV{LIB_DIR}/lib"
2122
c:/msys/local/lib
22-
"C:/dev/cpp/Expat 2.0.1/Bin"
2323
)
2424

2525
IF (EXPAT_INCLUDE_DIR AND EXPAT_LIBRARY)

‎cmake/FindGDAL.cmake

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,15 @@ IF(WIN32)
1717
ENDIF (MINGW)
1818

1919
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)
2229
ENDIF (MSVC)
2330

2431

‎cmake/FindGEOS.cmake

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,19 @@
1010
FIND_PATH(GEOS_INCLUDE_DIR geos.h
1111
/usr/local/include
1212
/usr/include
13-
c:/msys/local/include
1413
#MSVC
15-
C:/dev/cpp/geos-2.2.1/source/headers
14+
"$ENV{LIB_DIR}/include"
15+
#mingw
16+
c:/msys/local/include
1617
)
1718

1819
FIND_LIBRARY(GEOS_LIBRARY NAMES geos PATHS
1920
/usr/local/lib
2021
/usr/lib
21-
c:/msys/local/lib
2222
#MSVC
23-
C:/dev/cpp/geos-2.2.1/source
23+
"$ENV{LIB_DIR}/lib"
24+
#mingw
25+
c:/msys/local/lib
2426
)
2527

2628
IF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY)

‎cmake/FindGSL.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,7 @@
2626
IF(WIN32)
2727

2828
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}")
3130
FIND_LIBRARY(GSL_LIB gsl PATHS
3231
${GSL_MINGW_PREFIX}/lib
3332
${GSL_MSVC_PREFIX}/lib
@@ -38,7 +37,7 @@ IF(WIN32)
3837
${GSL_MSVC_PREFIX}/lib
3938
)
4039

41-
FIND_PATH(GSL_INCLUDE_DIR gsl/gsl_version.h
40+
FIND_PATH(GSL_INCLUDE_DIR gsl/gsl_blas.h
4241
${GSL_PREFIX}/include
4342
${GSL_MSVC_PREFIX}/include
4443
)

‎cmake/FindProj.cmake

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,17 @@
1010
FIND_PATH(PROJ_INCLUDE_DIR proj_api.h
1111
/usr/local/include
1212
/usr/include
13+
#msvc
14+
"$ENV{LIB_DIR}/include/proj"
15+
#mingw
1316
c:/msys/local/include
14-
C:/dev/cpp/proj-4.5.0/src
1517
)
1618

1719
FIND_LIBRARY(PROJ_LIBRARY NAMES proj PATHS
1820
/usr/local/lib
1921
/usr/lib
22+
"$ENV{LIB_DIR}/lib"
2023
c:/msys/local/lib
21-
C:/dev/cpp/proj-4.5.0/src
2224
)
2325

2426
IF (PROJ_INCLUDE_DIR AND PROJ_LIBRARY)

‎cmake/FindSqlite3.cmake

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,18 @@
1010
FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h
1111
/usr/local/include
1212
/usr/include
13-
c:/msys/local/include
1413
#msvc
15-
c:/dev/cpp/sqlite3
14+
"$ENV{LIB_DIR}/include/sqlite"
15+
#mingw
16+
c:/msys/local/include
1617
)
1718

1819
FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3 PATHS
1920
/usr/local/lib
2021
/usr/lib
2122
c:/msys/local/lib
2223
#msvc
23-
c:/dev/cpp/sqlite3
24+
"$ENV{LIB_DIR}/lib"
2425
)
2526

2627
IF (SQLITE3_INCLUDE_DIR AND SQLITE3_LIBRARY)

‎cmake/Flex.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
MACRO(FIND_FLEX)
55
IF(NOT FLEX_EXECUTABLE)
66
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+
)
810
ELSE(MSVC)
911
FIND_PROGRAM(FLEX_EXECUTABLE flex)
1012
ENDIF (MSVC)

0 commit comments

Comments
 (0)
Please sign in to comment.