diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-02-18 23:44:40 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-02-18 23:45:59 +0300 |
| commit | ee9ac4e4fc495ea4a913cfff63650dfe07da35e2 (patch) | |
| tree | 1a2a10802698285f7e8e13193dd6a5d021251ce0 | |
| parent | 54994740bdfe2aa3b2e7233de9494b3b033183f1 (diff) | |
CMake: remove expression in endif(...)
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 2 | ||||
| -rw-r--r-- | source/blender/freestyle/CMakeLists.txt | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5b8530640b9..93e34f45854 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 056241b3767..5624941f2f7 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 6860afe64c2..7fbb219af08 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}") |