Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
otb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
273
Issues
273
List
Boards
Labels
Service Desk
Milestones
Merge Requests
8
Merge Requests
8
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Main Repositories
otb
Commits
873306a4
Commit
873306a4
authored
Oct 01, 2008
by
Thomas Feuvrier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
COMP: cmake correction for Mac OS X to suppress cmake warning (POLICY NEW conform)
parent
e30c8693
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
CMakeLists.txt
CMakeLists.txt
+1
-1
Code/Gui/CMakeLists.txt
Code/Gui/CMakeLists.txt
+1
-1
Utilities/FLTK/fluid/CMakeLists.txt
Utilities/FLTK/fluid/CMakeLists.txt
+3
-3
No files found.
CMakeLists.txt
View file @
873306a4
...
@@ -514,7 +514,7 @@ ENDIF(WIN32)
...
@@ -514,7 +514,7 @@ ENDIF(WIN32)
IF
(
OTB_USE_VISU_GUI
)
IF
(
OTB_USE_VISU_GUI
)
SET
(
OTB_VISU_GUI_LIBRARIES
"
${
FLTK_LIBRARIES
}
;
${
OPENGL_LIBRARIES
}
;
${
FLTK_PLATFORM_DEPENDENT_LIBS
}
"
)
SET
(
OTB_VISU_GUI_LIBRARIES
"
${
FLTK_LIBRARIES
}
;
${
OPENGL_LIBRARIES
}
;
${
FLTK_PLATFORM_DEPENDENT_LIBS
}
"
)
IF
(
APPLE
)
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
)
ENDIF
(
APPLE
)
ELSE
(
OTB_USE_VISU_GUI
)
ELSE
(
OTB_USE_VISU_GUI
)
SET
(
OTB_VISU_GUI_LIBRARIES
""
)
SET
(
OTB_VISU_GUI_LIBRARIES
""
)
...
...
Code/Gui/CMakeLists.txt
View file @
873306a4
...
@@ -6,7 +6,7 @@ FILE(GLOB OTBGui_SRCS "*.cxx" )
...
@@ -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
# 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
)
IF
(
APPLE AND BUILD_SHARED_LIBS
)
FOREACH
(
c
""
"_DEBUG"
"_RELEASE"
"_MINSIZEREL"
"_RELWITHDEBINFO"
)
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
)
ENDFOREACH
(
c
)
ENDIF
(
APPLE AND BUILD_SHARED_LIBS
)
ENDIF
(
APPLE AND BUILD_SHARED_LIBS
)
...
...
Utilities/FLTK/fluid/CMakeLists.txt
View file @
873306a4
...
@@ -27,8 +27,8 @@ INSTALL_TARGETS(/bin fluid)
...
@@ -27,8 +27,8 @@ INSTALL_TARGETS(/bin fluid)
TARGET_LINK_LIBRARIES
(
fluid
${
OTB_VISU_GUI_LIBRARIES
}
${
FLTK_PLATFORM_DEPENDENT_LIBS
}
)
TARGET_LINK_LIBRARIES
(
fluid
${
OTB_VISU_GUI_LIBRARIES
}
${
FLTK_PLATFORM_DEPENDENT_LIBS
}
)
IF
(
OPENGL_FOUND
)
IF
(
OPENGL_FOUND
)
TARGET_LINK_LIBRARIES
(
fluid fltk_gl
)
TARGET_LINK_LIBRARIES
(
fluid fltk_gl
)
IF
(
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
)
#
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(APPLE)
ENDIF
(
OPENGL_FOUND
)
ENDIF
(
OPENGL_FOUND
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment