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
Container Registry
Model registry
Operate
Environments
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
Antoine Belvire
otb
Commits
22355050
Commit
22355050
authored
11 years ago
by
Stéphane Albert
Browse files
Options
Downloads
Patches
Plain Diff
ENH: Configured CMake to link to OTB-Ice.
parent
556f5a8b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMake/FindOTBIce.cmake
+0
-0
0 additions, 0 deletions
CMake/FindOTBIce.cmake
Code/Application/Monteverdi2/CMakeLists.txt
+1
-0
1 addition, 0 deletions
Code/Application/Monteverdi2/CMakeLists.txt
Code/Common/Gui/CMakeLists.txt
+7
-3
7 additions, 3 deletions
Code/Common/Gui/CMakeLists.txt
with
8 additions
and
3 deletions
CMake/FindIce.cmake
→
CMake/Find
OTB
Ice.cmake
+
0
−
0
View file @
22355050
File moved
This diff is collapsed.
Click to expand it.
Code/Application/Monteverdi2/CMakeLists.txt
+
1
−
0
View file @
22355050
...
...
@@ -26,6 +26,7 @@ set( Monteverdi2_Catalogue_RESOURCES
# General include directories.
include_directories
(
${
ICE_INCLUDE_DIRS
}
${
QWT_INCLUDE_DIRS
}
#
${
Monteverdi2_BINARY_DIR
}
...
...
This diff is collapsed.
Click to expand it.
Code/Common/Gui/CMakeLists.txt
+
7
−
3
View file @
22355050
...
...
@@ -136,7 +136,7 @@ set( Common_Gui_RESOURCES
)
include_directories
(
${
QWT
_INCLUDE_DIRS
}
${
ICE
_INCLUDE_DIRS
}
#
${
Monteverdi2_BINARY_DIR
}
#
...
...
@@ -146,9 +146,13 @@ include_directories(
${
Monteverdi2_BINARY_DIR
}
/Code/Common
${
Monteverdi2_BINARY_DIR
}
/Code/Common/Gui
#
${
ICE
_INCLUDE_DIRS
}
${
QWT
_INCLUDE_DIRS
}
)
# message( "INCLUDE_DIRECTORIES: ${INCLUDE_DIRECTORIES}" )
# message( "ICE_INCLUDE_DIRS: ${ICE_INCLUDE_DIRS}" )
# message( "ICE_LIBRARIES: ${ICE_LIBRARIES}" )
#############################################################################
# Qt4 wrapped files.
qt4_wrap_cpp
(
Common_Gui_SRC_MOC
${
Common_Gui_HEADERS_MOC
}
)
...
...
@@ -176,12 +180,12 @@ add_library(Monteverdi2_Gui
#############################################################################
target_link_libraries
(
Monteverdi2_Gui
Monteverdi2_Core
${
ICE_LIBRARIES
}
${
OPENGL_LIBRARIES
}
#Qt4::QtCore
Qt4::QtGui
Qt4::QtOpenGL
${
QWT_LIBRARIES
}
${
ICE_LIBRARIES
}
)
set_target_properties
(
Monteverdi2_Gui
...
...
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