Commit: 9ce972521124f73c86ad6cbf5c37ff3c5f01b7f7
Author: Martijn Berger
Date: Sat Nov 15 12:42:21 2014 +0100
Branches: master
https://developer.blender.org/rB9ce972521124f73c86ad6cbf5c37ff3c5f01b7f7
Cmake windows, removing more redundant things
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3e238ef..c8b40ff 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1190,16 +1190,10 @@ elseif(WIN32)
# Setup 64bit and 64bit windows systems
if(CMAKE_CL_64)
message(STATUS "64 bit compiler detected.")
- set(LIBDIR_BASE
${CMAKE_SOURCE_DIR}/../lib/win64)
+ set(LIBDIR
${CMAKE_SOURCE_DIR}/../lib/win64_vc12)
else()
message(STATUS "32 bit compiler detected.")
- set(LIBDIR_BASE
${CMAKE_SOURCE_DIR}/../lib/windows)
- endif()
- if(MSVC12)
- message(STATUS "Visual C++ 2013 detected.")
- set(LIBDIR ${LIBDIR_BASE}_vc12)
- else()
- set(LIBDIR ${LIBDIR_BASE})
+ set(LIBDIR
${CMAKE_SOURCE_DIR}/../lib/windows_vc12)
endif()
else()
message(STATUS using LIBDIR ${LIBDIR})
@@ -1428,6 +1422,7 @@ elseif(WIN32)
set(OPENIMAGEIO_LIBRARIES ${OIIO_OPTIMIZED}
${OIIO_DEBUG})
set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
set(OPENIMAGEIO_DEFINITIONS "-DUSE_TBB=0")
+ set(OPENCOLORIO_DEFINITIONS "-DOCIO_STATIC_BUILD")
endif()
if(WITH_LLVM)
@@ -1990,7 +1985,6 @@ elseif(APPLE)
set(OPENCOLORIO_INCLUDE_DIRS ${OPENCOLORIO}/include)
set(OPENCOLORIO_LIBRARIES OpenColorIO tinyxml yaml-cpp)
set(OPENCOLORIO_LIBPATH ${OPENCOLORIO}/lib)
- set(OPENCOLORIO_DEFINITIONS "-DOCIO_STATIC_BUILD")
endif()
if(WITH_LLVM)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
