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
873306a4
Commit
873306a4
authored
16 years ago
by
Thomas Feuvrier
Browse files
Options
Downloads
Patches
Plain Diff
COMP: cmake correction for Mac OS X to suppress cmake warning (POLICY NEW conform)
parent
e30c8693
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
CMakeLists.txt
+1
-1
1 addition, 1 deletion
CMakeLists.txt
Code/Gui/CMakeLists.txt
+1
-1
1 addition, 1 deletion
Code/Gui/CMakeLists.txt
Utilities/FLTK/fluid/CMakeLists.txt
+3
-3
3 additions, 3 deletions
Utilities/FLTK/fluid/CMakeLists.txt
with
5 additions
and
5 deletions
CMakeLists.txt
+
1
−
1
View file @
873306a4
...
...
@@ -514,7 +514,7 @@ ENDIF(WIN32)
IF
(
OTB_USE_VISU_GUI
)
SET
(
OTB_VISU_GUI_LIBRARIES
"
${
FLTK_LIBRARIES
}
;
${
OPENGL_LIBRARIES
}
;
${
FLTK_PLATFORM_DEPENDENT_LIBS
}
"
)
IF
(
APPLE
)
SET
(
OTB_VISU_GUI_LIBRARIES
"
${
OTB_VISU_GUI_LIBRARIES
}
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
"
)
SET
(
OTB_VISU_GUI_LIBRARIES
"
${
OTB_VISU_GUI_LIBRARIES
}
;
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
)
ENDIF
(
APPLE
)
ELSE
(
OTB_USE_VISU_GUI
)
SET
(
OTB_VISU_GUI_LIBRARIES
""
)
...
...
This diff is collapsed.
Click to expand it.
Code/Gui/CMakeLists.txt
+
1
−
1
View file @
873306a4
...
...
@@ -6,7 +6,7 @@ FILE(GLOB OTBGui_SRCS "*.cxx" )
# To suppress "ld: cycle in dylib re-exports with /usr/X11R6/lib/libGL.dylib" error on APPLE and SHARED configuration
IF
(
APPLE AND BUILD_SHARED_LIBS
)
FOREACH
(
c
""
"_DEBUG"
"_RELEASE"
"_MINSIZEREL"
"_RELWITHDEBINFO"
)
SET
(
CMAKE_SHARED_LINKER_FLAGS
${
c
}
"
${
CMAKE_SHARED_LINKER_FLAGS
${
c
}}
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
)
SET
(
CMAKE_SHARED_LINKER_FLAGS
${
c
}
"
${
CMAKE_SHARED_LINKER_FLAGS
${
c
}}
;
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
)
ENDFOREACH
(
c
)
ENDIF
(
APPLE AND BUILD_SHARED_LIBS
)
...
...
This diff is collapsed.
Click to expand it.
Utilities/FLTK/fluid/CMakeLists.txt
+
3
−
3
View file @
873306a4
...
...
@@ -27,8 +27,8 @@ INSTALL_TARGETS(/bin fluid)
TARGET_LINK_LIBRARIES
(
fluid
${
OTB_VISU_GUI_LIBRARIES
}
${
FLTK_PLATFORM_DEPENDENT_LIBS
}
)
IF
(
OPENGL_FOUND
)
TARGET_LINK_LIBRARIES
(
fluid fltk_gl
)
IF
(
APPLE
)
TARGET_LINK_LIBRARIES
(
fluid -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib
)
ENDIF
(
APPLE
)
#
IF(APPLE)
#
TARGET_LINK_LIBRARIES(fluid -Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib)
#
ENDIF(APPLE)
ENDIF
(
OPENGL_FOUND
)
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