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

Cmake windows, removing more redundant things

Browse Source
This commit is contained in:
Martijn Berger
2014-11-15 12:42:21 +01:00
parent 237bd11bc5
commit 9ce9725211
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@@ -1190,16 +1190,10 @@ elseif(WIN32)
# Setup 64bit and 64bit windows systems # Setup 64bit and 64bit windows systems
if(CMAKE_CL_64) if(CMAKE_CL_64)
message(STATUS "64 bit compiler detected.") message(STATUS "64 bit compiler detected.")
set(LIBDIR_BASE ${CMAKE_SOURCE_DIR}/../lib/win64) set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64_vc12)
else() else()
message(STATUS "32 bit compiler detected.") message(STATUS "32 bit compiler detected.")
set(LIBDIR_BASE ${CMAKE_SOURCE_DIR}/../lib/windows) set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/windows_vc12)
endif()
if(MSVC12)
message(STATUS "Visual C++ 2013 detected.")
set(LIBDIR ${LIBDIR_BASE}_vc12)
else()
set(LIBDIR ${LIBDIR_BASE})
endif() endif()
else() else()
message(STATUS using LIBDIR ${LIBDIR}) message(STATUS using LIBDIR ${LIBDIR})
@@ -1428,6 +1422,7 @@ elseif(WIN32)
set(OPENIMAGEIO_LIBRARIES ${OIIO_OPTIMIZED} ${OIIO_DEBUG}) set(OPENIMAGEIO_LIBRARIES ${OIIO_OPTIMIZED} ${OIIO_DEBUG})
set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib) set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0") set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0")
set(OPENCOLORIO_DEFINITIONS "-DOCIO_STATIC_BUILD")
endif() endif()
if(WITH_LLVM) if(WITH_LLVM)
@@ -1990,7 +1985,6 @@ elseif(APPLE)
set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include) set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
set(OPENCOLORIO_LIBRARIES OpenColorIO tinyxml yaml-cpp) set(OPENCOLORIO_LIBRARIES OpenColorIO tinyxml yaml-cpp)
set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib) set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
set(OPENCOLORIO_DEFINITIONS "-DOCIO_STATIC_BUILD")
endif() endif()
if(WITH_LLVM) if(WITH_LLVM)