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

vs2012 build #2

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

vs2012 build #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05a3d11
Update UseFbx.cmake
Jun 4, 2014
24e872c
Update UseFbx.cmake
Jun 5, 2014
505440d
Update UseOpenSceneGraph.cmake
Jun 5, 2014
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
17 changes: 8 additions & 9 deletions external/UseFbx.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ endif()

if(WIN32)
if(FBX_TOOL_VS10)
set(EXTLIB_NAME fbxsdk_win-2014-vs10)
set(EXTLIB_NAME fbxsdk_win_2014-vs10)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this file name should change ~ typo?

elseif(FBX_TOOL_VS11)
set(EXTLIB_NAME fbxsdk_win)
set(EXTLIB_NAME fbxsdk_win-2014-vs11)
endif()
set(EXTLIB_DIR ${CMAKE_BINARY_DIR}/fbxsdk_win)
elseif(UNIX)
Expand All @@ -22,8 +22,11 @@ elseif(UNIX)
set(EXTLIB_DIR ${CMAKE_BINARY_DIR}/fbxsdk_linux)
endif(APPLE)
endif()

set(EXTLIB_TGZ ${CMAKE_BINARY_DIR}/${EXTLIB_NAME}.tar.gz)
if(WIN32 AND FBX_TOOL_VS11)
set(EXTLIB_TGZ ${CMAKE_BINARY_DIR}/${EXTLIB_NAME}/${EXTLIB_NAME}.tar.gz)
else()
set(EXTLIB_TGZ ${CMAKE_BINARY_DIR}/${EXTLIB_NAME}.tar.gz)
endif()
if(NOT EXISTS ${EXTLIB_DIR})
message(STATUS "Downloading FBX SDK binary archive...")
if(APPLE)
Expand All @@ -40,11 +43,7 @@ if(NOT EXISTS ${EXTLIB_DIR})
message(STATUS "FBX SDK binary archive downloaded")
endif()
endif(APPLE)
if(FBX_TOOL_VS11)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf ${CMAKE_BINARY_DIR}/${EXTLIB_NAME}/${EXTLIB_TGZ} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
elseif(FBX_TOOL_VS11)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf ${EXTLIB_TGZ} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
endif(FBX_TOOL_VS11)
execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf ${EXTLIB_TGZ} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
endif()

set(FBX_DEFAULT_ROOT ${EXTLIB_DIR})
Expand Down
1 change: 1 addition & 0 deletions external/UseOpenSceneGraph.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ if(WIN32)
URL ${CMAKE_SOURCE_DIR}/modules/omegaOsg/external/osg.tar.gz
CMAKE_ARGS
-DBUILD_OSG_APPLICATIONS=OFF
-DOSG_USE_QT=OFF
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}
-DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE}
-DCMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG}
Expand Down