Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Windows MSVC libraries:

Browse Source 
* Some refactor, use set_lib_path macro again, which simplifies the code a bit.
This commit is contained in:
Thomas Dinges
2012-08-04 20:25:04 +00:00
parent 2044b62370
commit ab1badf9a2
3 changed files with 24 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
CMakeLists.txt
View File

@@ -902,26 +902,22 @@ elseif(WIN32)
${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include ${LIBDIR}/opencollada/include/COLLADASaxFrameworkLoader/include
${LIBDIR}/opencollada/include/GeneratedSaxParser/include ${LIBDIR}/opencollada/include/GeneratedSaxParser/include
) )
if(MSVC2010) set_lib_path(OPENCOLLADA_LIBPATH "opencollada")
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/vc2010/lib)
else()
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
endif()
set(OPENCOLLADA_LIBRARIES set(OPENCOLLADA_LIBRARIES
${OPENCOLLADA_LIBPATH}/OpenCOLLADASaxFrameworkLoader.lib ${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADASaxFrameworkLoader.lib
${OPENCOLLADA_LIBPATH}/OpenCOLLADAFramework.lib ${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADAFramework.lib
${OPENCOLLADA_LIBPATH}/OpenCOLLADABaseUtils.lib ${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADABaseUtils.lib
${OPENCOLLADA_LIBPATH}/OpenCOLLADAStreamWriter.lib ${OPENCOLLADA_LIBPATH}/lib/OpenCOLLADAStreamWriter.lib
${OPENCOLLADA_LIBPATH}/MathMLSolver.lib ${OPENCOLLADA_LIBPATH}/lib/MathMLSolver.lib
${OPENCOLLADA_LIBPATH}/GeneratedSaxParser.lib ${OPENCOLLADA_LIBPATH}/lib/GeneratedSaxParser.lib
${OPENCOLLADA_LIBPATH}/xml2.lib ${OPENCOLLADA_LIBPATH}/lib/xml2.lib
${OPENCOLLADA_LIBPATH}/buffer.lib ${OPENCOLLADA_LIBPATH}/lib/buffer.lib
${OPENCOLLADA_LIBPATH}/ftoa.lib ${OPENCOLLADA_LIBPATH}/lib/ftoa.lib
${OPENCOLLADA_LIBPATH}/UTF.lib ${OPENCOLLADA_LIBPATH}/lib/UTF.lib
) )
set(PCRE_LIBRARIES set(PCRE_LIBRARIES
${OPENCOLLADA_LIBPATH}/pcre.lib ${OPENCOLLADA_LIBPATH}/lib/pcre.lib
) )
unset(OPENCOLLADA_LIBPATH) unset(OPENCOLLADA_LIBPATH)
@@ -943,14 +939,9 @@ elseif(WIN32)
endif() endif()
if(WITH_IMAGE_OPENEXR) if(WITH_IMAGE_OPENEXR)
set(OPENEXR ${LIBDIR}/openexr) set_lib_path(OPENEXR "openexr")
if(MSVC10) set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
set(OPENEXR_INCLUDE_DIR ${OPENEXR}/vc2010/include) set(OPENEXR_LIBPATH ${OPENEXR}/lib)
set(OPENEXR_LIBPATH ${OPENEXR}/vc2010/lib)
else()
set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
set(OPENEXR_LIBPATH ${OPENEXR}/lib)
endif()
set(OPENEXR_LIBRARIES set(OPENEXR_LIBRARIES
${OPENEXR_LIBPATH}/Iex.lib ${OPENEXR_LIBPATH}/Iex.lib
${OPENEXR_LIBPATH}/Half.lib ${OPENEXR_LIBPATH}/Half.lib
@@ -982,13 +973,9 @@ elseif(WIN32)
if(WITH_PYTHON) if(WITH_PYTHON)
# normally cached but not since we include them with blender # normally cached but not since we include them with blender
set(PYTHON_VERSION 3.2) # CACHE STRING) set(PYTHON_VERSION 3.2) # CACHE STRING)
set(PYTHON ${LIBDIR}/python) set_lib_path(PYTHON "python")
set(PYTHON_INCLUDE_DIR ${PYTHON}/include/python${PYTHON_VERSION}) set(PYTHON_INCLUDE_DIR ${PYTHON}/include/python${PYTHON_VERSION})
if(MSVC10) set(PYTHON_LIBRARY ${PYTHON}/lib/python32.lib) #CACHE FILEPATH
set(PYTHON_LIBRARY ${PYTHON}/vc2010/lib/python32.lib) #CACHE FILEPATH
else()
set(PYTHON_LIBRARY ${PYTHON}/lib/python32.lib) #CACHE FILEPATH
endif()
# uncached vars # uncached vars
set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}") set(PYTHON_INCLUDE_DIRS "${PYTHON_INCLUDE_DIR}")

7
build_files/cmake/macros.cmake
View File

@@ -719,12 +719,9 @@ macro(set_lib_path
lvar lvar
lproj) lproj)
if(MSVC10)
if(MSVC10 AND EXISTS ${LIBDIR}/vc2010/${lproj}) set(${lvar} ${LIBDIR}/${lproj}/vc2010)
set(${lvar} ${LIBDIR}/vc2010/${lproj})
else() else()
set(${lvar} ${LIBDIR}/${lproj}) set(${lvar} ${LIBDIR}/${lproj})
endif() endif()
endmacro() endmacro()

10
source/creator/CMakeLists.txt
View File

@@ -475,15 +475,15 @@ elseif(WIN32)
endif() endif()
if(WITH_PYTHON) if(WITH_PYTHON)
set_lib_path(PYLIB "python/lib") set_lib_path(PYLIB "python")
install( install(
FILES ${PYLIB}/python32.dll FILES ${PYLIB}/lib/python32.dll
DESTINATION ${TARGETDIR} DESTINATION ${TARGETDIR}
CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
) )
install( install(
FILES ${PYLIB}/python32_d.dll FILES ${PYLIB}/lib/python32_d.dll
DESTINATION ${TARGETDIR} DESTINATION ${TARGETDIR}
CONFIGURATIONS Debug CONFIGURATIONS Debug
) )
@@ -627,10 +627,10 @@ elseif(WIN32)
if(WITH_OPENIMAGEIO) if(WITH_OPENIMAGEIO)
if(NOT MINGW) if(NOT MINGW)
set_lib_path(OIIOBIN "openimageio/bin") set_lib_path(OIIOBIN "openimageio")
install( install(
FILES FILES
${OIIOBIN}/OpenImageIO.dll ${OIIOBIN}/bin/OpenImageIO.dll
DESTINATION ${TARGETDIR} DESTINATION ${TARGETDIR}
) )
endif() endif()