Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CMake for Mac OSX using Homebrew #24

Open
wants to merge 15 commits into
base: devel
Choose a base branch
from
Open

CMake for Mac OSX using Homebrew #24

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1f38640
Removed binvox binaries from octomap source
Jan 8, 2013
0cf4dfd
Updated READMEs with new code / doc locations
Dec 20, 2012
8732320
Documentation updates
Jan 8, 2013
efaa6b2
.gitignore html/ folder (contains gh-pages branch)
Dec 19, 2012
93f7e1f
valgrind output to .gitignore
Jan 16, 2013
4a117df
Changelog for 1.5.4 release
Feb 27, 2013
a37f359
Merge branch 'v1.5-fixes' for release
Feb 27, 2013
7e778e9
Fix: increased version in CMakeLists to 1.5.4
Feb 27, 2013
9897eb3
Merge branch 'v1.5-fixes'
Feb 27, 2013
5f77cb6
Merge branch 'devel' (1.6.0 release)
Apr 5, 2013
ffa2c10
Modify CMake system to support Mac OSX using Homebrew package managem…
smcgill3 Apr 9, 2013
0144c02
Merge remote-tracking branch 'upstream/master' into devel
smcgill3 May 15, 2013
4fc279a
Merge remote-tracking branch 'upstream/devel' into devel
smcgill3 May 15, 2013
113e09e
Merge branch 'devel' into osx
smcgill3 May 15, 2013
30b10be
Merge remote-tracking branch 'upstream/devel' into osx
smcgill3 Jun 13, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions octovis/CMakeLists_src.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,10 @@ include(${QT_USE_FILE})

# Mac OS X seems to require special linker flags:
IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework OpenGL")
SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework OpenGL")
SET (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -framework OpenGL")
# QGL has framework issues
SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework QGLViewer")
SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -framework QGLViewer")
SET (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -framework QGLViewer")
ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

# sources for octovis library
Expand Down Expand Up @@ -79,8 +80,14 @@ target_link_libraries(octovis-shared
${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY}
${OCTOMAP_LIBRARIES}
)
if(APPLE)
else()
target_link_libraries(octovis-shared
${QGLViewer_LIBRARIES}
)
endif()

set_target_properties(octovis-shared PROPERTIES OUTPUT_NAME octovis)

# directly depend on the octomap library target when building the
Expand All @@ -96,18 +103,16 @@ endif()
add_executable(octovis ${viewer_SRCS} ${viewer_UIS_H} ${viewer_MOC_SRCS} ${viewer_RES})

target_link_libraries(octovis
# ${QGLViewer_LIBRARIES}
${QT_LIBRARIES}
${OCTOMAP_LIBRARIES}
octovis-shared
)

# special handling of MacOS X:
IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
add_custom_command(TARGET octovis POST_BUILD
COMMAND install_name_tool -change libQGLViewer.2.dylib /opt/local/lib/libQGLViewer.2.dylib ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/octovis
)
ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
if(APPLE)
else()
target_link_libraries(octovis
${QGLViewer_LIBRARIES}
)
endif()

install(TARGETS octovis
octovis-static
Expand Down