diff --git a/plugins/blur/CMakeLists.txt b/plugins/blur/CMakeLists.txt
index 2eadecc..aa987e8 100644
--- a/plugins/blur/CMakeLists.txt
+++ b/plugins/blur/CMakeLists.txt
@@ -9,9 +9,9 @@ set(HEADERS
 set(SOURCES
     blur.cpp)
 
-if (APPLE)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
-endif (APPLE)
+if(APPLE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
+endif()
 
 add_library(blur SHARED ${HEADERS} ${SOURCES})
 
diff --git a/plugins/geom/CMakeLists.txt b/plugins/geom/CMakeLists.txt
index 85e29e3..0fc639e 100644
--- a/plugins/geom/CMakeLists.txt
+++ b/plugins/geom/CMakeLists.txt
@@ -10,9 +10,9 @@ set(HEADERS
 set(SOURCES
     geom.cpp)
 
-if (APPLE)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
-endif (APPLE)
+if(APPLE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
+endif()
 
 add_library(geom SHARED ${HEADERS} ${SOURCES})
 
diff --git a/plugins/multiplugin/CMakeLists.txt b/plugins/multiplugin/CMakeLists.txt
index bbd9ef6..455985c 100644
--- a/plugins/multiplugin/CMakeLists.txt
+++ b/plugins/multiplugin/CMakeLists.txt
@@ -9,9 +9,9 @@ set(HEADERS
 set(SOURCES
     multi.cpp)
 
-if (APPLE)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
-endif (APPLE)
+if(APPLE)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++")
+endif()
 
 add_library(multi SHARED ${HEADERS} ${SOURCES})
 
diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt
index d7e32cd..e4aa0dd 100644
--- a/toonz/sources/CMakeLists.txt
+++ b/toonz/sources/CMakeLists.txt
@@ -12,7 +12,7 @@ endif()
 
 message("Thirdpary Library Search path:" ${THIRDPARTY_LIBS_HINTS})
 
-if (WIN32)
+if(WIN32)
     message("Windows System")
     if(CMAKE_SIZEOF_VOID_P EQUAL 4)
         set(QT_PATH "C:/Qt/Qt5.6.0_32/5.6/msvc2013" CACHE PATH "Qt instlattion directory")
@@ -26,13 +26,13 @@ if (WIN32)
     set(QT_LIB_PATH ${QT_PATH})
     set(CMAKE_PREFIX_PATH "${QT_PATH}/lib/cmake/")
     add_definitions(-DNOMINMAX)
-elseif (APPLE)
+elseif(APPLE)
     message("Apple System")
-    if (NOT PLATFORM)
+    if(NOT PLATFORM)
         set(PLATFORM 64)
     endif()
     message("PLATFORM:" ${PLATFORM})
-    if (PLATFORM EQUAL 64)
+    if(PLATFORM EQUAL 64)
         set(QT_PATH "~/Qt/5.6/clang_64/lib" CACHE PATH "Qt instlattion directory")
         set(QT_LIB_PATH "${QT_PATH}/")
         set(CMAKE_PREFIX_PATH "${QT_LIB_PATH}cmake/")
@@ -53,9 +53,9 @@ elseif (APPLE)
     else()
         message(FATAL_ERROR "Invalid PLATFORM:" ${PLATFORM} ". 'PLATFORM' must be 32 or 64.")
     endif()
-else ()
+else()
     message("Unknown System")
-endif ()
+endif()
 
 add_definitions(-DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED)
 
@@ -120,7 +120,7 @@ set(TNZSTDFX_Location)
 set(TFARM_Location)
 
 if(WIN32)
-    if (CMAKE_SIZEOF_VOID_P EQUAL 4)
+    if(CMAKE_SIZEOF_VOID_P EQUAL 4)
         set(PLATFORM 32)
         set(PLATFORM2)
     else()
@@ -146,7 +146,7 @@ if(WIN32)
     set(SUPERLU_LIB ${SDKROOT}/superlu/SuperLU_${PLATFORM}.lib)
     set(OPENBLAS_LIB ${SDKROOT}/openblas/libopenblas_${PLATFORM}.lib)
     set(USB_LIB)  # unused
-    if (PLATFORM EQUAL 32)
+    if(PLATFORM EQUAL 32)
         set(QT_LIB ${SDKROOT}/quicktime/QT73SDK/Libraries/QTMLClient.lib)
     endif()
 else()
@@ -186,7 +186,7 @@ else()
 
     pkg_check_modules(USB_LIB REQUIRED libusb-1.0)
     set(OPENBLAS_LIB) # unused?
-    if (PLATFORM EQUAL 32)
+    if(PLATFORM EQUAL 32)
         find_library(QT_LIB QuickTime)
     endif()
 
@@ -200,8 +200,8 @@ endif()
 include_directories(BEFORE ${TIFF_INCLUDE_DIR} ${PNG_INCLUDE_DIRS})
 
 find_path(BOOST_ROOT include/boost boost HINTS ${THIRDPARTY_LIBS_HINTS}
-	PATH_SUFFIXES boost/boost_1_60_0/ boost/boost_1_59_0/
-	boost/boost_1_58_0/ boost/boost_1_57_0/ boost/boost_1_56_0/ boost155/1.55.0_1/ boost/boost_1_55_0/ )
+    PATH_SUFFIXES boost/boost_1_60_0/ boost/boost_1_59_0/
+    boost/boost_1_58_0/ boost/boost_1_57_0/ boost/boost_1_56_0/ boost155/1.55.0_1/ boost/boost_1_55_0/ )
 find_package(Boost 1.55 REQUIRED)
 
 include_directories(${Boost_INCLUDE_DIR} ${LZ4_LIB_INCLUDE_DIRS} ${USB_LIB_INCLUDE_DIRS} ${SUPERLU_INCLUDE_DIR} ${JPEG_INCLUDE_DIR})
@@ -216,7 +216,7 @@ if(WIN32)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
 endif()
 
-if (MSVC AND MSVC_VERSION EQUAL 1800)
+if(MSVC AND MSVC_VERSION EQUAL 1800)
     # Visual C++ 2013 cannot handle UTF-8 without BOM
     # Non-ascii characters in comments would not be a problem
     add_compile_options("/wd4819")
@@ -264,9 +264,9 @@ if(PLATFORM EQUAL 32)
     add_subdirectory(t32bitsrv)
 endif()
 
-if (APPLE)
+if(APPLE)
     add_custom_command(TARGET executable
         POST_BUILD COMMAND
         ${CMAKE_INSTALL_NAME_TOOL} -add_rpath ${CMAKE_INSTALL_RPATH}
         $<TARGET_FILE:executable>)
-endif (APPLE)
+endif()
diff --git a/toonz/sources/colorfx/CMakeLists.txt b/toonz/sources/colorfx/CMakeLists.txt
index 037eb6f..3df863d 100644
--- a/toonz/sources/colorfx/CMakeLists.txt
+++ b/toonz/sources/colorfx/CMakeLists.txt
@@ -18,9 +18,9 @@ add_translation(colorfx ${HEADERS} ${SOURCES})
 
 add_library(colorfx SHARED ${HEADERS} ${SOURCES})
 add_definitions(-D _USRDLL -DCOLORFX_EXPORTS -DUSE_MESA)
-if (APPLE)
+if(APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libcolorfx.dylib")
-endif (APPLE)
+endif()
 
 message("subdir: colorfx")
 message("type:" ${CMAKE_SHARED_LIBRARY_SUFFIX})
diff --git a/toonz/sources/image/CMakeLists.txt b/toonz/sources/image/CMakeLists.txt
index 9e4c63a..f36123e 100644
--- a/toonz/sources/image/CMakeLists.txt
+++ b/toonz/sources/image/CMakeLists.txt
@@ -48,7 +48,7 @@ set(SOURCES
     3gp/tiio_3gp_proxy.cpp
     mesh/tiio_mesh.cpp)
 
-if (WIN32)
+if(WIN32)
     set(HEADERS ${HEADERS}
         avi/tiio_avi.h
         mov/tiio_mov.h
@@ -57,20 +57,20 @@ if (WIN32)
         avi/tiio_avi.cpp
         mov/tiio_movW.cpp
         3gp/tiio_3gpW.cpp)
-else ()
+else()
     set(HEADERS ${HEADERS}
         mov/tiio_movM.h
         3gp/tiio_3gpM.h)
     set(SOURCES ${SOURCES}
         mov/tiio_movM.cpp
         3gp/tiio_3gpM.cpp)
-endif ()
+endif()
 
 add_library(image SHARED ${HEADERS} ${SOURCES})
 add_definitions(-DTNZIMAGE_DLL -D_USRDLL -DIMAGE_EXPORTS)
-if (APPLE)
+if(APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libimage.dylib")
-endif (APPLE)
+endif()
 
 message("subdir: image")
 message("Bin: " ${CMAKE_CURRENT_BINARY_DIR})
@@ -78,7 +78,7 @@ message("Bin: " ${CMAKE_CURRENT_BINARY_DIR})
 include_directories(
     ${TIFF_INCLUDE_DIR}
     ${SDKROOT}/LibJPEG/jpeg-9)
-if (WIN32)
+if(WIN32)
     include_directories(${SDKROOT}/libpng-1.6.21)
     if(PLATFORM EQUAL 32)
         include_directories(${SDKROOT}/quicktime/QT73SDK/CIncludes)
@@ -92,10 +92,10 @@ if(WIN32)
         ${TNZLIBS}
         vfw32.lib)
 else()
-    if (PLATFORM EQUAL 32)
+    if(PLATFORM EQUAL 32)
         find_library(CORE_SERVICES_LIB CoreServices)
         set(OSX_10_6_SDK_PATH "")
-        if (NOT OSX_10_6_SDK_PATH)
+        if(NOT OSX_10_6_SDK_PATH)
            message(FATAL_ERROR "Set variable 'OSX_10_6_SDK_PATH'")
         endif()
         find_library(QD_LIB
diff --git a/toonz/sources/sound/CMakeLists.txt b/toonz/sources/sound/CMakeLists.txt
index 126fe95..3a58356 100644
--- a/toonz/sources/sound/CMakeLists.txt
+++ b/toonz/sources/sound/CMakeLists.txt
@@ -14,9 +14,9 @@ set(SOURCES
     
 add_library(sound SHARED ${HEADERS} ${SOURCES})
 add_definitions(-DSOUND_EXPORTS)
-if (APPLE)
+if(APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libsound.dylib")
-endif (APPLE)
+endif()
 
 message("subdir: sound")
 message("type:" ${CMAKE_SHARED_LIBRARY_SUFFIX})
diff --git a/toonz/sources/stdfx/CMakeLists.txt b/toonz/sources/stdfx/CMakeLists.txt
index e49fdee..cd5b839 100644
--- a/toonz/sources/stdfx/CMakeLists.txt
+++ b/toonz/sources/stdfx/CMakeLists.txt
@@ -246,9 +246,9 @@ set(SOURCES
 
 add_library(tnzstdfx SHARED ${HEADERS} ${SOURCES} ${OBJCSOURCES})
 add_definitions(-D_USRDLL -DTNZSTDFX_EXPORTS)
-if (APPLE)
+if(APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtnzstdfx.dylib")
-endif (APPLE)
+endif()
 
 message("subdir: tnzstdfx")
 message("Bin: " ${CMAKE_CURRENT_BINARY_DIR})
@@ -261,15 +261,15 @@ endif()
 
 _find_toonz_library(TNZLIBS "tnzcore;tnzbase;toonzlib")
 
-if (APPLE)
-   # macports を使っていると symbol が非互換の /opt/lib が引っ掛かってしまう
-   find_library(ICONV_LIB iconv HINTS /usr/lib)
-   if(ICONV_LIB-NOTFOUND)
-       message("************* NO ICONV ****************")
-   else()
-       message("************* ICONV:" ${ICONV_LIB})
-   endif()
-   target_link_libraries(tnzstdfx Qt5::Core Qt5::Gui Qt5::OpenGL ${GL_LIB} ${GLEW_LIB} ${TNZLIBS} ${ICONV_LIB})
-else ()
-   target_link_libraries(tnzstdfx Qt5::Core Qt5::Gui Qt5::OpenGL ${GL_LIB} ${GLEW_LIB} ${TNZLIBS})
-endif ()
+if(APPLE)
+    # macports を使っていると symbol が非互換の /opt/lib が引っ掛かってしまう
+    find_library(ICONV_LIB iconv HINTS /usr/lib)
+    if(ICONV_LIB-NOTFOUND)
+        message("************* NO ICONV ****************")
+    else()
+        message("************* ICONV:" ${ICONV_LIB})
+    endif()
+    target_link_libraries(tnzstdfx Qt5::Core Qt5::Gui Qt5::OpenGL ${GL_LIB} ${GLEW_LIB} ${TNZLIBS} ${ICONV_LIB})
+else()
+    target_link_libraries(tnzstdfx Qt5::Core Qt5::Gui Qt5::OpenGL ${GL_LIB} ${GLEW_LIB} ${TNZLIBS})
+endif()
diff --git a/toonz/sources/t32bitsrv/CMakeLists.txt b/toonz/sources/t32bitsrv/CMakeLists.txt
index 321854a..27cd22d 100644
--- a/toonz/sources/t32bitsrv/CMakeLists.txt
+++ b/toonz/sources/t32bitsrv/CMakeLists.txt
@@ -7,7 +7,7 @@ add_executable(t32bitsrv
     t32movmsg.cpp
     t32movmsg.h)
 
-if (WIN32)
+if(WIN32)
     include_directories(${SDKROOT}/quicktime/QT73SDK/CIncludes)
 endif()
 
@@ -17,7 +17,7 @@ target_link_libraries(t32bitsrv
     tnzcore
     image)
 
-if (APPLE AND PLATFORM EQUAL 32)
+if(APPLE AND PLATFORM EQUAL 32)
     get_target_property(bin t32bitsrv LOCATION)
     get_filename_component(bindir ${bin} DIRECTORY)
 
diff --git a/toonz/sources/tnzbase/CMakeLists.txt b/toonz/sources/tnzbase/CMakeLists.txt
index a560bd7..d3ea516 100644
--- a/toonz/sources/tnzbase/CMakeLists.txt
+++ b/toonz/sources/tnzbase/CMakeLists.txt
@@ -114,13 +114,13 @@ set(SOURCES
     tscanner/tscannerutil.cpp
     tscanner/tscannerepson.cpp)
 
-if (WIN32)
+if(WIN32)
     set(SOURCES ${SOURCES}
         tscanner/TScannerIO/TUSBScannerIO_W.cpp)
-else ()
+else()
     set(SOURCES ${SOURCES}
         tscanner/TScannerIO/TUSBScannerIO_M.cpp)
-endif ()
+endif()
 
 set(OBJCSOURCES
     ../common/twain/ttwain_capability.c
@@ -132,17 +132,17 @@ set(OBJCSOURCES
     tscanner/tscanner.cpp
     tscanner/tscannertwain.cpp)
 
-if (WIN32)
+if(WIN32)
     set(OBJCSOURCES ${OBJCSOURCES}
         ../common/twain/ttwain_stateW.c
         ../common/twain/ttwain_utilW.c
         ../common/twain/ttwain_winW.c)
-else ()
+else()
     set(OBJCSOURCES ${OBJCSOURCES}
         ../common/twain/ttwain_stateM.c
         ../common/twain/ttwain_utilM.c
         ../common/twain/ttwain_winM.c)
-endif ()
+endif()
 
 if(APPLE)
     #set_source_files_properties(${OBJCSOURCES} PROPERTIES LANGUAGE OBJCXX)
@@ -153,9 +153,9 @@ qt5_wrap_cpp(SOURCES ${MOC_HEADERS})
 
 add_library(tnzbase SHARED ${HEADERS} ${SOURCES} ${OBJCSOURCES})
 
-if (APPLE)
+if(APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtnzbase.dylib")
-endif (APPLE)
+endif()
 
 add_definitions(-DTNZBASE_EXPORTS -DTPARAM_EXPORTS -DTXSHEET_EXPORTS -DTFX_EXPORTS -DTAPPTOOLS_EXPORTS -DTTEST_EXPORTS)
 
diff --git a/toonz/sources/tnzcore/CMakeLists.txt b/toonz/sources/tnzcore/CMakeLists.txt
index 2ef803d..6adfd51 100644
--- a/toonz/sources/tnzcore/CMakeLists.txt
+++ b/toonz/sources/tnzcore/CMakeLists.txt
@@ -258,9 +258,9 @@ qt5_wrap_cpp(SOURCES ${MOC_HEADERS})
 
 add_library(tnzcore SHARED ${HEADERS} ${SOURCES})
 
-if (APPLE)
+if(APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtnzcore.dylib")
-endif (APPLE)
+endif()
 
 add_definitions(-DTNZCORE_EXPORTS -DTCOLOR_EXPORTS -DTGEOMETRY_EXPORTS -DTRASTER_EXPORTS -DTIMAGE_EXPORTS -DTSYSTEM_EXPORTS -DTVECTORIMAGE_EXPORTS -DTGL_EXPORTS -DTSOUND_EXPORTS -DTIMAGE_IO_EXPORTS -DTRASTERIMAGE_EXPORTS -DTVRENDER_EXPORTS -DTFLASH_EXPORTS -DTROP_EXPORTS -DTSTREAM_EXPORTS)
 
@@ -268,7 +268,7 @@ message("subdir: tnzcore")
 message("Sources:" ${SOURCES})
 
 include_directories(../common/flash ${SDKROOT}/Lz4/Lz4_131/lib/)
-if (WIN32)
+if(WIN32)
     if(PLATFORM EQUAL 32)
         include_directories(${SDKROOT}/quicktime/QT73SDK/CIncludes)
     endif()
diff --git a/toonz/sources/tnzext/CMakeLists.txt b/toonz/sources/tnzext/CMakeLists.txt
index 2662e54..2bc4abb 100644
--- a/toonz/sources/tnzext/CMakeLists.txt
+++ b/toonz/sources/tnzext/CMakeLists.txt
@@ -74,18 +74,18 @@ endif()
 
 add_library(tnzext SHARED ${HEADERS} ${SOURCES} ${OBJCSOURCES})
 
-if (APPLE)
+if(APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtnzext.dylib")
-endif (APPLE)
+endif()
 
 add_definitions(-DTNZEXT_EXPORTS)
 
 message("subdir: tnzext")
 message("Bin: " ${CMAKE_CURRENT_BINARY_DIR})
 
-if (APPLE)
-find_library(ACCE_LIB Accelerate)
-endif (APPLE)
+if(APPLE)
+    find_library(ACCE_LIB Accelerate)
+endif()
 
 include_directories(${SDKROOT}/superlu/SuperLU_4.1/SRC)
 
diff --git a/toonz/sources/tnztools/CMakeLists.txt b/toonz/sources/tnztools/CMakeLists.txt
index 7390d63..d4ab5fb 100644
--- a/toonz/sources/tnztools/CMakeLists.txt
+++ b/toonz/sources/tnztools/CMakeLists.txt
@@ -101,9 +101,9 @@ qt5_wrap_cpp(SOURCES ${MOC_HEADERS})
 add_library(tnztools SHARED ${HEADERS} ${SOURCES} ${RESOURCES})
 add_definitions(-DTNZTOOLS_EXPORTS)
 
-if (APPLE)
+if(APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtnztools.dylib")
-endif (APPLE)
+endif()
 
 message("subdir: tnztools")
 message("Bin: " ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/toonz/sources/toonz/CMakeLists.txt b/toonz/sources/toonz/CMakeLists.txt
index 24093f9..2db3600 100644
--- a/toonz/sources/toonz/CMakeLists.txt
+++ b/toonz/sources/toonz/CMakeLists.txt
@@ -72,7 +72,7 @@ set(MOC_HEADERS
     mainwindow.h
     matchline.h
     menubar.h
-	menubarpopup.h
+    menubarpopup.h
     menubarcommandids.h
     meshifypopup.h
     messagepanel.h
@@ -160,7 +160,7 @@ set(SOURCES
     mainwindow.cpp
     matchline.cpp
     menubar.cpp
-	menubarpopup.cpp
+    menubarpopup.cpp
     mergecolumns.cpp
     moviegenerator.cpp
     pane.cpp
@@ -312,13 +312,13 @@ set(OBJCSOURCES filebrowsermodel.cpp)
 # Resource file(s)
 set(RESOURCES toonz.qrc)
 
-if (WIN32)
+if(WIN32)
     set(RC_FILE toonz.rc)
-endif ()
+endif()
 
 qt5_add_resources(SOURCES ${RESOURCES})
 
-if (APPLE)
+if(APPLE)
     #set_source_files_properties(${OBJCSOURCES} PROPERTIES LANGUAGE OBJCXX)
     set_source_files_properties(${OBJCSOURCES} PROPERTIES COMPILE_FLAGS "-x objective-c++")
 endif()
@@ -346,7 +346,7 @@ message("Bin: " ${CMAKE_CURRENT_BINARY_DIR})
 
 include_directories(../../sources/toonzfarm/include)
 include_directories(../../sources/toonzqt)
-if (WIN32)
+if(WIN32)
     if(PLATFORM EQUAL 32)
         include_directories(${SDKROOT}/quicktime/QT73SDK/CIncludes)
     endif()
@@ -369,7 +369,7 @@ else()
 
 endif()
 
-if (APPLE)
+if(APPLE)
     # CMAKE_RUNTIME_OUTPUT_DIRECTORY should be equivalent to usage on windows despite empty
     # OSX だと CMAKE_RUNTIME_OUTPUT_DIRECTORY が空だが Windows 版と同じ使い方ができるようにしておく
     get_target_property(bin OpenToonz_${VERSION} LOCATION)
@@ -382,7 +382,7 @@ if(LZODRIVER_FOUND)
     add_custom_command(TARGET OpenToonz_${VERSION} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:lzodecompress> ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} DEPENDS lzodecompress)
 endif()
 
-if (APPLE)
+if(APPLE)
     get_target_property(loc OpenToonz_${VERSION} MACOSX_BUNDLE_NAME)
     message(" ==> App Bundle: " ${loc})
     message(" ==> Mach-o: " ${bin})
@@ -403,8 +403,6 @@ if (APPLE)
     add_custom_command(TARGET OpenToonz_${VERSION} POST_BUILD COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/qss)
 
     add_custom_command(TARGET OpenToonz_${VERSION} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ../../install/SystemVar.ini ${CMAKE_CURRENT_BINARY_DIR}/OpenToonz_${VERSION}.app/Contents/Resources)
-
-
-endif (APPLE)
+endif()
 
 
diff --git a/toonz/sources/toonzfarm/tfarm/CMakeLists.txt b/toonz/sources/toonzfarm/tfarm/CMakeLists.txt
index b099e0b..d7205b3 100644
--- a/toonz/sources/toonzfarm/tfarm/CMakeLists.txt
+++ b/toonz/sources/toonzfarm/tfarm/CMakeLists.txt
@@ -22,9 +22,9 @@ set(SOURCES
 
 add_library(tfarm SHARED ${HEADERS} ${SOURCES})
 add_definitions(-DTFARM_EXPORTS)
-if (APPLE)
+if(APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtfarm.dylib")
-endif (APPLE)
+endif()
 
 message("subdir: tfarm")
 message("Bin: " ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/toonz/sources/toonzlib/CMakeLists.txt b/toonz/sources/toonzlib/CMakeLists.txt
index d0493f3..177088d 100644
--- a/toonz/sources/toonzlib/CMakeLists.txt
+++ b/toonz/sources/toonzlib/CMakeLists.txt
@@ -320,9 +320,9 @@ add_translation(toonzlib ${HEADERS} ${SOURCES})
 qt5_wrap_cpp(SOURCES ${MOC_HEADERS})
 
 add_library(toonzlib SHARED ${HEADERS} ${SOURCES})
-if (APPLE)
+if(APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtoonzlib.dylib")
-endif (APPLE)
+endif()
 
 add_definitions(-DTOONZLIB_EXPORTS)
 
diff --git a/toonz/sources/toonzqt/CMakeLists.txt b/toonz/sources/toonzqt/CMakeLists.txt
index f592a82..702aabf 100644
--- a/toonz/sources/toonzqt/CMakeLists.txt
+++ b/toonz/sources/toonzqt/CMakeLists.txt
@@ -211,9 +211,9 @@ qt5_add_resources(SOURCES ${RESOURCES})
 qt5_wrap_cpp(SOURCES ${MOC_HEADERS} OPTIONS ${incs})
 
 add_library(toonzqt SHARED ${HEADERS} ${SOURCES} ${RESOURCES})
-if (APPLE)
+if(APPLE)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,-install_name,@rpath/libtoonzqt.dylib")
-endif (APPLE)
+endif()
 
 add_definitions(-DQT_WIDGETS_LIB -DTOONZQT_EXPORTS)