forked from bartvdbraak/blender
CMake: remove expression in endif(...)
This commit is contained in:
parent
54994740bd
commit
ee9ac4e4fc
@ -1355,7 +1355,7 @@ elseif(WIN32)
|
||||
${OPENEXR_LIBPATH}/Imath-2_2.lib
|
||||
${OPENEXR_LIBPATH}/IlmThread-2_2.lib
|
||||
)
|
||||
endif(NOT OPENEXR_FOUND)
|
||||
endif()
|
||||
endif()
|
||||
|
||||
if(WITH_IMAGE_TIFF)
|
||||
@ -1395,10 +1395,10 @@ elseif(WIN32)
|
||||
if(WITH_BOOST)
|
||||
if(WITH_CYCLES_OSL)
|
||||
set(boost_extra_libs wave)
|
||||
endif(WITH_CYCLES_OSL)
|
||||
endif()
|
||||
if(WITH_INTERNATIONAL)
|
||||
list(APPEND boost_extra_libs locale)
|
||||
endif(WITH_INTERNATIONAL)
|
||||
endif()
|
||||
set(Boost_USE_STATIC_RUNTIME ON) # prefix lib
|
||||
set(Boost_USE_MULTITHREADED ON) # suffix -mt
|
||||
set(Boost_USE_STATIC_LIBS ON) # suffix -s
|
||||
@ -1525,7 +1525,7 @@ elseif(WIN32)
|
||||
if(WITH_MINGW64)
|
||||
message(STATUS "Compiling for 64 bit with MinGW-w64.")
|
||||
execute_process(COMMAND ${CMAKE_C_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
|
||||
if (GCC_VERSION VERSION_GREATER 4.9 OR GCC_VERSION VERSION_EQUAL 4.9)
|
||||
if(GCC_VERSION VERSION_GREATER 4.9 OR GCC_VERSION VERSION_EQUAL 4.9)
|
||||
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw64_gcc49)
|
||||
else()
|
||||
set(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/mingw64)
|
||||
|
@ -1103,7 +1103,7 @@ endmacro()
|
||||
macro(blender_project_hack_post)
|
||||
# --------------
|
||||
# MINGW HACK END
|
||||
if (_reset_standard_libraries)
|
||||
if(_reset_standard_libraries)
|
||||
# Must come after projecINCt(...)
|
||||
#
|
||||
# MINGW workaround for -ladvapi32 being included which surprisingly causes
|
||||
|
@ -577,6 +577,6 @@ if(WIN32)
|
||||
list(APPEND INC_SYS
|
||||
${PTHREADS_INC}
|
||||
)
|
||||
endif(WIN32)
|
||||
endif()
|
||||
|
||||
blender_add_lib(bf_freestyle "${SRC}" "${INC}" "${INC_SYS}")
|
||||
|
Loading…
Reference in New Issue
Block a user