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

cmake: remove set_lib_path macro

Browse Source
This commit is contained in:
Campbell Barton
2013-06-17 18:15:56 +00:00
parent 91d7df12ee
commit 970e9123b4
3 changed files with 14 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
CMakeLists.txt
View File

@@ -1124,26 +1124,22 @@ elseif(WIN32)
${OPENCOLLADA}/include/opencollada/COLLADASaxFrameworkLoader
${OPENCOLLADA}/include/opencollada/GeneratedSaxParser
)
set_lib_path(OPENCOLLADA_LIBPATH "opencollada")
set(OPENCOLLADA_LIBRARIES
${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAFramework.lib
${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADABaseUtils.lib
${OPENCOLLADA_LIBPATH}/lib/opencollada/OpenCOLLADAStreamWriter.lib
${OPENCOLLADA_LIBPATH}/lib/opencollada/MathMLSolver.lib
${OPENCOLLADA_LIBPATH}/lib/opencollada/GeneratedSaxParser.lib
${OPENCOLLADA_LIBPATH}/lib/opencollada/xml.lib
${OPENCOLLADA_LIBPATH}/lib/opencollada/buffer.lib
${OPENCOLLADA_LIBPATH}/lib/opencollada/ftoa.lib
${OPENCOLLADA_LIBPATH}/lib/opencollada/UTF.lib
${OPENCOLLADA}/lib/opencollada/OpenCOLLADASaxFrameworkLoader.lib
${OPENCOLLADA}/lib/opencollada/OpenCOLLADAFramework.lib
${OPENCOLLADA}/lib/opencollada/OpenCOLLADABaseUtils.lib
${OPENCOLLADA}/lib/opencollada/OpenCOLLADAStreamWriter.lib
${OPENCOLLADA}/lib/opencollada/MathMLSolver.lib
${OPENCOLLADA}/lib/opencollada/GeneratedSaxParser.lib
${OPENCOLLADA}/lib/opencollada/xml.lib
${OPENCOLLADA}/lib/opencollada/buffer.lib
${OPENCOLLADA}/lib/opencollada/ftoa.lib
${OPENCOLLADA}/lib/opencollada/UTF.lib
)
set(PCRE_LIBRARIES
${OPENCOLLADA_LIBPATH}/lib/opencollada/pcre.lib
${OPENCOLLADA}/lib/opencollada/pcre.lib
)
unset(OPENCOLLADA_LIBPATH)
endif()
if(WITH_CODEC_FFMPEG)
@@ -1172,7 +1168,7 @@ elseif(WIN32)
endif()
if(WITH_IMAGE_OPENEXR)
set_lib_path(OPENEXR "openexr")
set(OPENEXR ${LIBDIR}/openexr)
set(OPENEXR_INCLUDE_DIR ${OPENEXR}/include)
set(OPENEXR_INCLUDE_DIRS ${OPENEXR}/include/OpenEXR)
set(OPENEXR_LIBPATH ${OPENEXR}/lib)
@@ -1201,11 +1197,9 @@ elseif(WIN32)
if(WITH_PYTHON)
set(PYTHON_VERSION 3.3) # CACHE STRING)
set_lib_path(PYTHON "python")
string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
# Use shared libs for vc2008 and vc2010 until we actually have vc2010 libs
set(PYTHON_LIBRARY ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.lib)
# set(PYTHON_LIBRARY ${PYTHON}/lib/python${_PYTHON_VERSION_NO_DOTS}.lib) #CACHE FILEPATH
unset(_PYTHON_VERSION_NO_DOTS)
# Shared includes for both vc2008 and vc2010

6
build_files/cmake/macros.cmake
View File

@@ -751,12 +751,6 @@ function(delayed_do_install
endif()
endfunction()
macro(set_lib_path
lvar
lproj)
set(${lvar} ${LIBDIR}/${lproj})
endmacro()
macro(data_to_c
file_from file_to

6
source/creator/CMakeLists.txt
View File

@@ -488,18 +488,16 @@ elseif(WIN32)
)
if(WITH_PYTHON)
set_lib_path(PYLIB "python")
string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
install(
FILES ${PYLIB}/lib/python${_PYTHON_VERSION_NO_DOTS}.dll
FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}.dll
DESTINATION ${TARGETDIR}
CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
)
install(
FILES ${PYLIB}/lib/python${_PYTHON_VERSION_NO_DOTS}_d.dll
FILES ${LIBDIR}/python/lib/python${_PYTHON_VERSION_NO_DOTS}_d.dll
DESTINATION ${TARGETDIR}
CONFIGURATIONS Debug
)