Robotics
/
Gear
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Windows freeglut file directory missing error fixed

This commit is contained in:
Junggon Kim 2013-11-28 18:23:28 -08:00
parent 0967f32369
commit 792cfc745c
2 changed files with 40 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
examples/closed4r1p/CMakeLists.txt
View File

@ -4,20 +4,17 @@ message(STATUS "adding examples/closed4r1p...")
if( WIN32 ) if( WIN32 )
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
set(GLUT_FOUND 1) set(GLUT_FOUND 1)
# set(GLUT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/freeglut/include") if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) # 64 bit
# set(GLUT_LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/freeglut/lib") set(GLUT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/freeglut/include")
# set(GLUT_LIBRARIES "freeglut.lib") set(GLUT_LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/freeglut/lib/x64")
if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) # 64 bit set(GLUT_LIBRARIES "freeglut.lib")
set(GLUT_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/freeglut/include") file(GLOB GLUT_DLL "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/freeglut/bin/x64/freeglut.dll")
set(GLUT_LIBRARY_DIR "${CMAKE_SOURCE_DIR}/3rdparty/freeglut/lib/x64") else() # 32 bit
set(GLUT_LIBRARIES "freeglut.lib") set(GLUT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/freeglut/include")
# file(GLOB GLUT_DLL "${CMAKE_SOURCE_DIR}/3rdparty/freeglut/bin/x64/freeglut.dll") set(GLUT_LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/freeglut/lib")
else() # 32 bit set(GLUT_LIBRARIES "freeglut.lib")
set(GLUT_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/freeglut/include") file(GLOB GLUT_DLL "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/freeglut/bin/freeglut.dll")
set(GLUT_LIBRARY_DIR "${CMAKE_SOURCE_DIR}/3rdparty/freeglut/lib") endif()
set(GLUT_LIBRARIES "freeglut.lib")
# file(GLOB GLUT_DLL "${CMAKE_SOURCE_DIR}/3rdparty/freeglut/bin/freeglut.dll")
endif()
elseif( APPLE ) elseif( APPLE )
INCLUDE_DIRECTORIES ( /System/Library/Frameworks ) INCLUDE_DIRECTORIES ( /System/Library/Frameworks )
FIND_LIBRARY(COCOA_LIBRARY Cocoa) FIND_LIBRARY(COCOA_LIBRARY Cocoa)
@ -30,6 +27,7 @@ else()
find_package(GLUT REQUIRED) find_package(GLUT REQUIRED)
endif() endif()
# closed4r1p
file(GLOB closed4r1p_SRC "*.cpp" "*.h") file(GLOB closed4r1p_SRC "*.cpp" "*.h")
include_directories(${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR}) include_directories(${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
link_directories(${OPENGL_LIBRARY_DIR} ${GLUT_LIBRARY_DIR}) link_directories(${OPENGL_LIBRARY_DIR} ${GLUT_LIBRARY_DIR})

58
examples/twolink/CMakeLists.txt
View File

@ -1,35 +1,33 @@
message(STATUS "adding examples/twolink...") message(STATUS "adding examples/twolink...")
# find OpenGL and GLUT # find OpenGL and GLUT
if( WIN32 ) if( WIN32 )
find_package(OpenGL REQUIRED) find_package(OpenGL REQUIRED)
set(GLUT_FOUND 1) set(GLUT_FOUND 1)
# set(GLUT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/freeglut/include") if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) # 64 bit
# set(GLUT_LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/freeglut/lib") set(GLUT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/freeglut/include")
# set(GLUT_LIBRARIES "freeglut.lib") set(GLUT_LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/freeglut/lib/x64")
if( CMAKE_SIZEOF_VOID_P EQUAL 8 ) # 64 bit set(GLUT_LIBRARIES "freeglut.lib")
set(GLUT_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/freeglut/include") file(GLOB GLUT_DLL "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/freeglut/bin/x64/freeglut.dll")
set(GLUT_LIBRARY_DIR "${CMAKE_SOURCE_DIR}/3rdparty/freeglut/lib/x64") else() # 32 bit
set(GLUT_LIBRARIES "freeglut.lib") set(GLUT_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/freeglut/include")
# file(GLOB GLUT_DLL "${CMAKE_SOURCE_DIR}/3rdparty/freeglut/bin/x64/freeglut.dll") set(GLUT_LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/freeglut/lib")
else() # 32 bit set(GLUT_LIBRARIES "freeglut.lib")
set(GLUT_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/3rdparty/freeglut/include") file(GLOB GLUT_DLL "${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/freeglut/bin/freeglut.dll")
set(GLUT_LIBRARY_DIR "${CMAKE_SOURCE_DIR}/3rdparty/freeglut/lib") endif()
set(GLUT_LIBRARIES "freeglut.lib") elseif( APPLE )
# file(GLOB GLUT_DLL "${CMAKE_SOURCE_DIR}/3rdparty/freeglut/bin/freeglut.dll") INCLUDE_DIRECTORIES ( /System/Library/Frameworks )
endif() FIND_LIBRARY(COCOA_LIBRARY Cocoa)
elseif( APPLE ) FIND_LIBRARY(GLUT_LIBRARY GLUT )
INCLUDE_DIRECTORIES ( /System/Library/Frameworks ) FIND_LIBRARY(OpenGL_LIBRARY OpenGL )
FIND_LIBRARY(COCOA_LIBRARY Cocoa) MARK_AS_ADVANCED (COCOA_LIBRARY GLUT_LIBRARY OpenGL_LIBRARY)
FIND_LIBRARY(GLUT_LIBRARY GLUT ) SET(EXTRA_LIBS ${COCOA_LIBRARY} ${GLUT_LIBRARY} ${OpenGL_LIBRARY})
FIND_LIBRARY(OpenGL_LIBRARY OpenGL ) else()
MARK_AS_ADVANCED (COCOA_LIBRARY GLUT_LIBRARY OpenGL_LIBRARY) find_package(OpenGL REQUIRED)
SET(EXTRA_LIBS ${COCOA_LIBRARY} ${GLUT_LIBRARY} ${OpenGL_LIBRARY}) find_package(GLUT REQUIRED)
else() endif()
find_package(OpenGL REQUIRED)
find_package(GLUT REQUIRED) # twolink
endif()
file(GLOB twolink_SRC "*.cpp" "*.h") file(GLOB twolink_SRC "*.cpp" "*.h")
include_directories(${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR}) include_directories(${OPENGL_INCLUDE_DIR} ${GLUT_INCLUDE_DIR})
link_directories(${OPENGL_LIBRARY_DIR} ${GLUT_LIBRARY_DIR}) link_directories(${OPENGL_LIBRARY_DIR} ${GLUT_LIBRARY_DIR})