Commit: ee9ac4e4fc495ea4a913cfff63650dfe07da35e2
Author: Campbell Barton
Date: Thu Feb 19 07:44:40 2015 +1100
Branches: master
https://developer.blender.org/rBee9ac4e4fc495ea4a913cfff63650dfe07da35e2
CMake: remove expression in endif(...)
===================================================================
M CMakeLists.txt
M build_files/cmake/macros.cmake
M source/blender/freestyle/CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b85306..93e34f4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 056241b..5624941 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -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
diff --git a/source/blender/freestyle/CMakeLists.txt
b/source/blender/freestyle/CMakeLists.txt
index 6860afe..7fbb219 100644
--- a/source/blender/freestyle/CMakeLists.txt
+++ b/source/blender/freestyle/CMakeLists.txt
@@ -577,6 +577,6 @@ if(WIN32)
list(APPEND INC_SYS
${PTHREADS_INC}
)
-endif(WIN32)
+endif()
blender_add_lib(bf_freestyle "${SRC}" "${INC}" "${INC_SYS}")
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
