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

dont use 'if(${WITH_STATIC_LIBS})', no need to expend the variable.

Browse Source
This commit is contained in:
Campbell Barton
2013-06-19 11:26:11 +00:00
parent c63c6e4452
commit 15016873ab
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -562,12 +562,12 @@ set(PLATFORM_LINKFLAGS_DEBUG "")
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
macro(find_package_wrapper) macro(find_package_wrapper)
string(TOUPPER ${ARGV0} _NAME_UPPER) string(TOUPPER ${ARGV0} _NAME_UPPER)
if(${WITH_STATIC_LIBS}) if(WITH_STATIC_LIBS)
set(_cmake_find_library_suffixes_back ${CMAKE_FIND_LIBRARY_SUFFIXES}) set(_cmake_find_library_suffixes_back ${CMAKE_FIND_LIBRARY_SUFFIXES})
set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES}) set(CMAKE_FIND_LIBRARY_SUFFIXES .a ${CMAKE_FIND_LIBRARY_SUFFIXES})
endif() endif()
find_package(${ARGV}) find_package(${ARGV})
if(${WITH_STATIC_LIBS}) if(WITH_STATIC_LIBS)
set(CMAKE_FIND_LIBRARY_SUFFIXES ${_cmake_find_library_suffixes_back}) set(CMAKE_FIND_LIBRARY_SUFFIXES ${_cmake_find_library_suffixes_back})
unset(_cmake_find_library_suffixes_back) unset(_cmake_find_library_suffixes_back)
endif() endif()
@@ -707,7 +707,7 @@ if(UNIX AND NOT APPLE)
if(WITH_BOOST) if(WITH_BOOST)
# uses in build instructions to override include and library variables # uses in build instructions to override include and library variables
if(NOT BOOST_CUSTOM) if(NOT BOOST_CUSTOM)
if(${WITH_STATIC_LIBS}) if(WITH_STATIC_LIBS)
set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_LIBS ON)
endif() endif()
set(Boost_USE_MULTITHREADED ON) set(Boost_USE_MULTITHREADED ON)