Skip to content

Commit

Permalink
Removing GLUT from viewlib.
Browse files Browse the repository at this point in the history
  • Loading branch information
jbt committed Oct 2, 2012
1 parent 25f2249 commit ac4669d
Showing 1 changed file with 8 additions and 15 deletions.
23 changes: 8 additions & 15 deletions viewlib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,15 @@ PROJECT(viewlib)

FIND_PACKAGE(OpenGL REQUIRED)
FIND_PACKAGE(Qt4 REQUIRED)
#SET(Boost_ADDITIONAL_VERSIONS
# "1.42" "1.42.0"
# "1.43" "1.43.0"
# "1.44" "1.44.0"
# "1.47" "1.47.0")
#FIND_PACKAGE(Boost REQUIRED)


IF(WIN32)
SET(GLUT_INCLUDE_DIR
"$ENV{PROGRAMW6432}/Microsoft SDKs/Windows/v6.0A/Include"
)
ELSE(WIN32)
FIND_PACKAGE(GLUT REQUIRED)
ENDIF(WIN32)
#IF(WIN32)
# SET(GLUT_INCLUDE_DIR
# "$ENV{PROGRAMW6432}/Microsoft SDKs/Windows/v6.0A/Include"
# )
#ELSE(WIN32)
# FIND_PACKAGE(GLUT REQUIRED)
#ENDIF(WIN32)

MACRO (QT4_WRAP_UI_GO outfiles )
QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
Expand Down Expand Up @@ -50,8 +44,7 @@ INCLUDE_DIRECTORIES(
${sisl_SOURCE_DIR}/include
${QT_INCLUDES}
${OPENGL_INCLUDE_DIR}
${GLUT_INCLUDE_DIR}
# ${Boost_INCLUDE_DIR}
# ${GLUT_INCLUDE_DIR}
)


Expand Down

0 comments on commit ac4669d

Please sign in to comment.