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

Selective changes picked from: e01449fa4bb0df252d32a3b98ee1e8f195923d96

Browse Source 
Author: Jason Wilkins

Improves cmake's ability to find our libraries on Windows / MSVC 2013
This commit is contained in:
Martijn Berger
2014-07-15 16:33:05 +02:00
parent c2dba7e344
commit 490da48d78
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@@ -1080,7 +1080,7 @@ elseif(WIN32)
set(ZLIB_INCLUDE_DIR ${LIBDIR}/zlib/include) set(ZLIB_INCLUDE_DIR ${LIBDIR}/zlib/include)
set(ZLIB_LIBRARY ${LIBDIR}/zlib/lib/libz_st.lib) set(ZLIB_LIBRARY ${LIBDIR}/zlib/lib/libz_st.lib)
set(ZLIB_DIR ${LIBDIR}/zlib) set(ZLIB_DIR ${LIBDIR}/zlib)
find_package(zlib) # we want to find before finding things that depend on it like png #find_package(zlib) # we want to find before finding things that depend on it like png
find_package(png) find_package(png)
@@ -1093,7 +1093,7 @@ elseif(WIN32)
set(PNG_LIBPATH ${PNG}/lib) # not cmake defined set(PNG_LIBPATH ${PNG}/lib) # not cmake defined
endif() endif()
if(MSVC90) if(MSVC)
set(JPEG_NAMES ${JPEG_NAMES} libjpeg) set(JPEG_NAMES ${JPEG_NAMES} libjpeg)
endif() endif()
find_package(jpeg REQUIRED) find_package(jpeg REQUIRED)
@@ -1225,6 +1225,9 @@ elseif(WIN32)
if(WITH_INTERNATIONAL) if(WITH_INTERNATIONAL)
list(APPEND boost_extra_libs locale) list(APPEND boost_extra_libs locale)
endif(WITH_INTERNATIONAL) endif(WITH_INTERNATIONAL)
set(Boost_USE_STATIC_RUNTIME ON) # prefix lib
set(Boost_USE_MULTITHREADED ON) # suffix -mt
set(Boost_USE_STATIC_LIBS ON) # suffix -s
find_package(Boost COMPONENTS date_time filesystem thread regex system ${boost_extra_libs}) find_package(Boost COMPONENTS date_time filesystem thread regex system ${boost_extra_libs})
IF(NOT Boost_FOUND) IF(NOT Boost_FOUND)
message(WARNING "USING HARDCODED boost locations") message(WARNING "USING HARDCODED boost locations")