From 2e1cb68b4e8d942ae6d219a54bf05bf414ce91e6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Jun 30 2016 04:37:43 +0000 Subject: CMake: wrap lines for easier reading --- diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt index f54a473..a321fff 100644 --- a/toonz/sources/CMakeLists.txt +++ b/toonz/sources/CMakeLists.txt @@ -98,7 +98,9 @@ if(APPLE) endif() endif() -include_directories(include) +include_directories( + include +) # Find the QtWidgets library find_package(Qt5 REQUIRED @@ -117,7 +119,8 @@ if(WIN32) include_directories( ${SDKROOT}/glut/3.7.6/include ${SDKROOT}/zlib-1.2.8 - ${SDKROOT}/LibJPEG/jpeg-9) + ${SDKROOT}/LibJPEG/jpeg-9 + ) add_definitions(-DGLUT_NO_LIB_PRAGMA) endif() @@ -270,18 +273,41 @@ elseif(UNIX) pkg_check_modules(SDL_LIB REQUIRED sdl2) endif() -include_directories(BEFORE ${TIFF_INCLUDE_DIR} ${PNG_INCLUDE_DIRS}) +include_directories( + BEFORE + ${TIFF_INCLUDE_DIR} + ${PNG_INCLUDE_DIRS} +) if(WIN32 OR APPLE) - find_path(BOOST_ROOT include/boost boost HINTS ${THIRDPARTY_LIBS_HINTS} - PATH_SUFFIXES boost/boost_1_61_0/ 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_path( + BOOST_ROOT + include/boost + boost + HINTS + ${THIRDPARTY_LIBS_HINTS} + PATH_SUFFIXES + boost/boost_1_61_0/ + 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) else() find_package(Boost) endif() -include_directories(${Boost_INCLUDE_DIR} ${LZ4_LIB_INCLUDE_DIRS} ${USB_LIB_INCLUDE_DIRS} ${SUPERLU_INCLUDE_DIR} ${JPEG_INCLUDE_DIR}) +include_directories( + ${Boost_INCLUDE_DIR} + ${LZ4_LIB_INCLUDE_DIRS} + ${USB_LIB_INCLUDE_DIRS} + ${SUPERLU_INCLUDE_DIR} + ${JPEG_INCLUDE_DIR} +) if(WIN32 AND PLATFORM EQUAL 64) add_definitions(-Dx64)