diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2014-11-15 14:42:21 +0300 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2014-11-15 14:42:21 +0300 |
| commit | 9ce972521124f73c86ad6cbf5c37ff3c5f01b7f7 (patch) | |
| tree | b0a474463819955b861b40981f1c02967b03eda1 | |
| parent | 237bd11bc5daf3634e0695d9a85e066e49ef0857 (diff) | |
Cmake windows, removing more redundant things
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3e238ef71c7..c8b40ff0620 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) |