Skip to content

Build fix for OSX 10.6 and Ubuntu 11.10 #2

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

Open
bollig wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Build fix for OSX 10.6 and Ubuntu 11.10 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6.0)
# CUDA might not be part of CMake 2.6, either install 2.8 or install the CUDA modules yourself.
FIND_PACKAGE(Qt4 REQUIRED)
FIND_PACKAGE(CUDA REQUIRED)
FIND_PACKAGE(OpenGL REQUIRED)

# Necessary on Ubuntu 11.10 if we specify the compiler with
# "CXX=g++-4.4 CC=gcc-4.4 cmake"
SET(CUDA_NVCC_FLAGS "-ccbin;${CMAKE_CXX_COMPILER}")

install(FILES README.md LICENSE DESTINATION share/doc/${CMAKE_PROJECT_NAME}/)

# This is where the source code is.
SUBDIRS(src)


2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,6 @@ ELSEIF(WIN32)
CUDA_ADD_EXECUTABLE(${CMAKE_PROJECT_NAME} WIN32 ${cuda_qt_framework_CUDA_SRCS} ${cuda_qt_framework_SRCS_CXX})
ENDIF()

TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} ${QT_LIBRARIES})
TARGET_LINK_LIBRARIES(${CMAKE_PROJECT_NAME} ${QT_LIBRARIES} ${OPENGL_LIBRARIES})

INSTALL(TARGETS ${CMAKE_PROJECT_NAME} DESTINATION bin)