Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs-feliks
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
Feliks Kiszkurno
ogs-feliks
Commits
2b95bafb
Commit
2b95bafb
authored
13 years ago
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
Refactored geotiff library inclusion.
parent
a8cd09fb
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+0
-9
0 additions, 9 deletions
CMakeLists.txt
Gui/CMakeLists.txt
+1
-5
1 addition, 5 deletions
Gui/CMakeLists.txt
with
1 addition
and
14 deletions
CMakeLists.txt
+
0
−
9
View file @
2b95bafb
...
@@ -3,15 +3,6 @@ IF (NOT VTK_FOUND)
...
@@ -3,15 +3,6 @@ IF (NOT VTK_FOUND)
ENDIF
(
NOT VTK_FOUND
)
ENDIF
(
NOT VTK_FOUND
)
INCLUDE
(
${
VTK_USE_FILE
}
)
INCLUDE
(
${
VTK_USE_FILE
}
)
# Find libgeotiff
FIND_PACKAGE
(
LibGeoTiff
)
IF
(
libgeotiff_FOUND
)
ADD_DEFINITIONS
(
-Dlibgeotiff_FOUND
)
ENDIF
()
# libgeotiff_FOUND
IF
(
NOT MSVC
)
FIND_PACKAGE
(
LibTiff
)
ENDIF
()
# NOT MSVC
SET
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"
${
CMAKE_CXX_FLAGS_RELWITHDEBINFO
}
/ZI /Od /Ob0"
)
SET
(
CMAKE_CXX_FLAGS_RELWITHDEBINFO
"
${
CMAKE_CXX_FLAGS_RELWITHDEBINFO
}
/ZI /Od /Ob0"
)
# Add subprojects
# Add subprojects
...
...
This diff is collapsed.
Click to expand it.
Gui/CMakeLists.txt
+
1
−
5
View file @
2b95bafb
...
@@ -91,14 +91,11 @@ IF (Shapelib_FOUND)
...
@@ -91,14 +91,11 @@ IF (Shapelib_FOUND)
TARGET_LINK_LIBRARIES
(
ogs-gui
${
Shapelib_LIBRARIES
}
)
TARGET_LINK_LIBRARIES
(
ogs-gui
${
Shapelib_LIBRARIES
}
)
ENDIF
()
# Shapelib_FOUND
ENDIF
()
# Shapelib_FOUND
MESSAGE
(
STATUS
"
${
libgeotiff_LIBRARIES
}
"
)
IF
(
libgeotiff_FOUND
)
IF
(
libgeotiff_FOUND
)
TARGET_LINK_LIBRARIES
(
ogs-gui
${
libgeotiff_LIBRARIES
}
)
TARGET_LINK_LIBRARIES
(
ogs-gui
${
libgeotiff_LIBRARIES
}
)
ENDIF
()
# libgeotiff_FOUND
ENDIF
()
# libgeotiff_FOUND
IF
(
libtiff_FOUND
)
TARGET_LINK_LIBRARIES
(
ogs-gui
${
libtiff_LIBRARIES
}
)
ENDIF
()
# libtiff_FOUND
ADD_DEPENDENCIES
(
ogs-gui VtkVis OGSProject
)
ADD_DEPENDENCIES
(
ogs-gui VtkVis OGSProject
)
IF
(
MSVC
)
IF
(
MSVC
)
...
@@ -161,7 +158,6 @@ IF (OGS_VRED_PLUGIN)
...
@@ -161,7 +158,6 @@ IF (OGS_VRED_PLUGIN)
QtDataView
QtDataView
StratView
StratView
${
Shapelib_LIBRARIES
}
${
Shapelib_LIBRARIES
}
${
libtiff_LIBRARIES
}
${
libgeotiff_LIBRARIES
}
${
libgeotiff_LIBRARIES
}
QVTK
QVTK
VtkVis
VtkVis
...
...
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