Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
David Youssefi
otb
Commits
e3ddcb66
Commit
e3ddcb66
authored
16 years ago
by
Julien Michel
Browse files
Options
Downloads
Patches
Plain Diff
COMP: Small bug with if defined logics
parent
313eb090
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+3
-6
3 additions, 6 deletions
CMakeLists.txt
with
3 additions
and
6 deletions
CMakeLists.txt
+
3
−
6
View file @
e3ddcb66
...
...
@@ -365,7 +365,6 @@ ENDIF (NOT OGR_INCLUDE_DIRS)
INCLUDE_DIRECTORIES
(
${
OGR_INCLUDE_DIRS
}
)
# Check if ${GDAL_LIBRARY} has tiff library
SET
(
TIFF_LIBRARY
${
GDAL_LIBRARY
}
)
TRY_COMPILE
(
GDAL_HAS_TIFF
${
CMAKE_CURRENT_BINARY_DIR
}
CMake
${
CMAKE_CURRENT_SOURCE_DIR
}
/CMake/TestGDALHasTiff.cxx
...
...
@@ -373,9 +372,9 @@ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${TIFF_INCLUDE_DIRS};${GDAL_INCLUDE_DIRS
OUTPUT_VARIABLE OUTPUT
)
IF
(
GDAL_HAS_TIFF
)
MESSAGE
(
STATUS
"Testing if GDAL has tiff -- yes"
)
SET
(
TIFF_LIBRARY
${
GDAL_LIBRARY
}
)
ELSE
(
GDAL_HAS_TIFF
)
MESSAGE
(
STATUS
"Testing if GDAL has tiff -- no"
)
MESSAGE
(
${
OUTPUT
}
)
FIND_LIBRARY
(
TIFF_LIBRARY tiff PATHS
)
IF
(
NOT TIFF_LIBRARY
)
MESSAGE
(
FATAL_ERROR
...
...
@@ -384,7 +383,6 @@ ENDIF (NOT TIFF_LIBRARY)
ENDIF
(
GDAL_HAS_TIFF
)
# Check if ${GDAL_LIBRARY} has geotiff library
SET
(
GEOTIFF_LIBRARY
${
GDAL_LIBRARY
}
)
TRY_COMPILE
(
GDAL_HAS_GEOTIFF
${
CMAKE_CURRENT_BINARY_DIR
}
/CMake
${
CMAKE_CURRENT_SOURCE_DIR
}
/CMake/TestGDALHasGeoTiff.cxx
...
...
@@ -392,9 +390,9 @@ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${GEOTIFF_INCLUDE_DIRS};${GDAL_INCLUDE_D
OUTPUT_VARIABLE OUTPUT
)
IF
(
GDAL_HAS_GEOTIFF
)
MESSAGE
(
STATUS
"Testing if GDAL has geotiff -- yes"
)
SET
(
GEOTIFF_LIBRARY
${
GDAL_LIBRARY
}
)
ELSE
(
GDAL_HAS_GEOTIFF
)
MESSAGE
(
STATUS
"Testing if GDAL has geotiff -- no"
)
MESSAGE
(
${
OUTPUT
}
)
FIND_LIBRARY
(
GEOTIFF_LIBRARY geotiff PATHS
)
IF
(
NOT GEOTIFF_LIBRARY
)
MESSAGE
(
FATAL_ERROR
...
...
@@ -403,7 +401,6 @@ ENDIF (NOT GEOTIFF_LIBRARY)
ENDIF
(
GDAL_HAS_GEOTIFF
)
# Check if ${GDAL_LIBRARY} has jpeg library
SET
(
JPEG_LIBRARY
${
GDAL_LIBRARY
}
)
TRY_COMPILE
(
GDAL_HAS_JPEG
${
CMAKE_CURRENT_BINARY_DIR
}
/CMake
${
CMAKE_CURRENT_SOURCE_DIR
}
/CMake/TestGDALHasJpeg.cxx
...
...
@@ -411,9 +408,9 @@ CMAKE_FLAGS "-DINCLUDE_DIRECTORIES:PATH=${JPEG_INCLUDE_DIRS};${GDAL_INCLUDE_DIRS
OUTPUT_VARIABLE OUTPUT
)
IF
(
GDAL_HAS_JPEG
)
MESSAGE
(
STATUS
"Testing if GDAL has jpeg -- yes"
)
SET
(
JPEG_LIBRARY
${
GDAL_LIBRARY
}
)
ELSE
(
GDAL_HAS_JPEG
)
MESSAGE
(
STATUS
"Testing if GDAL has jpeg -- no"
)
MESSAGE
(
${
OUTPUT
}
)
FIND_LIBRARY
(
JPEG_LIBRARY jpeg PATHS
)
IF
(
NOT JPEG_LIBRARY
)
MESSAGE
(
FATAL_ERROR
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment