diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:35:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-04-17 07:35:54 +0300 |
commit | 3076d95ba441cd32706a27d18922a30f8fd28b8a (patch) | |
tree | 1c4f33b41c3d6d94a738e598c95423cdcfa8a34d /build_files/cmake/Modules | |
parent | 91a9cd0a94000047248598394c41ac30f893f147 (diff) |
Cleanup: use 2 space indentation for CMake
Diffstat (limited to 'build_files/cmake/Modules')
-rw-r--r-- | build_files/cmake/Modules/FindGLEW.cmake | 2 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindLLVM.cmake | 84 | ||||
-rw-r--r-- | build_files/cmake/Modules/FindSndFile.cmake | 14 | ||||
-rw-r--r-- | build_files/cmake/Modules/GTestTesting.cmake | 82 |
4 files changed, 91 insertions, 91 deletions
diff --git a/build_files/cmake/Modules/FindGLEW.cmake b/build_files/cmake/Modules/FindGLEW.cmake index b36a3272e3d..593b1693fd0 100644 --- a/build_files/cmake/Modules/FindGLEW.cmake +++ b/build_files/cmake/Modules/FindGLEW.cmake @@ -23,7 +23,7 @@ # If GLEW_ROOT_DIR was defined in the environment, use it. IF(NOT GLEW_ROOT_DIR AND NOT $ENV{GLEW_ROOT_DIR} STREQUAL "") - SET(GLEW_ROOT_DIR $ENV{GLEW_ROOT_DIR}) + SET(GLEW_ROOT_DIR $ENV{GLEW_ROOT_DIR}) ENDIF() SET(_glew_SEARCH_DIRS diff --git a/build_files/cmake/Modules/FindLLVM.cmake b/build_files/cmake/Modules/FindLLVM.cmake index a40a71cb58e..141a91c0508 100644 --- a/build_files/cmake/Modules/FindLLVM.cmake +++ b/build_files/cmake/Modules/FindLLVM.cmake @@ -22,65 +22,65 @@ #============================================================================= if(LLVM_ROOT_DIR) - if(DEFINED LLVM_VERSION) - find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_ROOT_DIR}/bin NO_CMAKE_PATH) - endif() - if(NOT LLVM_CONFIG) - find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_ROOT_DIR}/bin NO_CMAKE_PATH) - endif() + if(DEFINED LLVM_VERSION) + find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_ROOT_DIR}/bin NO_CMAKE_PATH) + endif() + if(NOT LLVM_CONFIG) + find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_ROOT_DIR}/bin NO_CMAKE_PATH) + endif() else() - if(DEFINED LLVM_VERSION) + if(DEFINED LLVM_VERSION) message(running llvm-config-${LLVM_VERSION}) - find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION}) - endif() - if(NOT LLVM_CONFIG) - find_program(LLVM_CONFIG llvm-config) - endif() + find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION}) + endif() + if(NOT LLVM_CONFIG) + find_program(LLVM_CONFIG llvm-config) + endif() endif() if(NOT DEFINED LLVM_VERSION) - execute_process(COMMAND ${LLVM_CONFIG} --version - OUTPUT_VARIABLE LLVM_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE) - set(LLVM_VERSION ${LLVM_VERSION} CACHE STRING "Version of LLVM to use") + execute_process(COMMAND ${LLVM_CONFIG} --version + OUTPUT_VARIABLE LLVM_VERSION + OUTPUT_STRIP_TRAILING_WHITESPACE) + set(LLVM_VERSION ${LLVM_VERSION} CACHE STRING "Version of LLVM to use") endif() if(NOT LLVM_ROOT_DIR) - execute_process(COMMAND ${LLVM_CONFIG} --prefix - OUTPUT_VARIABLE LLVM_ROOT_DIR - OUTPUT_STRIP_TRAILING_WHITESPACE) - set(LLVM_ROOT_DIR ${LLVM_ROOT_DIR} CACHE PATH "Path to the LLVM installation") + execute_process(COMMAND ${LLVM_CONFIG} --prefix + OUTPUT_VARIABLE LLVM_ROOT_DIR + OUTPUT_STRIP_TRAILING_WHITESPACE) + set(LLVM_ROOT_DIR ${LLVM_ROOT_DIR} CACHE PATH "Path to the LLVM installation") endif() if(NOT LLVM_LIBPATH) - execute_process(COMMAND ${LLVM_CONFIG} --libdir - OUTPUT_VARIABLE LLVM_LIBPATH - OUTPUT_STRIP_TRAILING_WHITESPACE) - set(LLVM_LIBPATH ${LLVM_LIBPATH} CACHE PATH "Path to the LLVM library path") - mark_as_advanced(LLVM_LIBPATH) + execute_process(COMMAND ${LLVM_CONFIG} --libdir + OUTPUT_VARIABLE LLVM_LIBPATH + OUTPUT_STRIP_TRAILING_WHITESPACE) + set(LLVM_LIBPATH ${LLVM_LIBPATH} CACHE PATH "Path to the LLVM library path") + mark_as_advanced(LLVM_LIBPATH) endif() if(LLVM_STATIC) - find_library(LLVM_LIBRARY - NAMES LLVMAnalysis # first of a whole bunch of libs to get - PATHS ${LLVM_LIBPATH}) + find_library(LLVM_LIBRARY + NAMES LLVMAnalysis # first of a whole bunch of libs to get + PATHS ${LLVM_LIBPATH}) else() - find_library(LLVM_LIBRARY - NAMES - LLVM-${LLVM_VERSION} - LLVMAnalysis # check for the static library as a fall-back - PATHS ${LLVM_LIBPATH}) + find_library(LLVM_LIBRARY + NAMES + LLVM-${LLVM_VERSION} + LLVMAnalysis # check for the static library as a fall-back + PATHS ${LLVM_LIBPATH}) endif() if(LLVM_LIBRARY AND LLVM_ROOT_DIR AND LLVM_LIBPATH) - if(LLVM_STATIC) - # if static LLVM libraries were requested, use llvm-config to generate - # the list of what libraries we need, and substitute that in the right - # way for LLVM_LIBRARY. - execute_process(COMMAND ${LLVM_CONFIG} --libfiles - OUTPUT_VARIABLE LLVM_LIBRARY - OUTPUT_STRIP_TRAILING_WHITESPACE) - string(REPLACE " " ";" LLVM_LIBRARY "${LLVM_LIBRARY}") - endif() + if(LLVM_STATIC) + # if static LLVM libraries were requested, use llvm-config to generate + # the list of what libraries we need, and substitute that in the right + # way for LLVM_LIBRARY. + execute_process(COMMAND ${LLVM_CONFIG} --libfiles + OUTPUT_VARIABLE LLVM_LIBRARY + OUTPUT_STRIP_TRAILING_WHITESPACE) + string(REPLACE " " ";" LLVM_LIBRARY "${LLVM_LIBRARY}") + endif() endif() diff --git a/build_files/cmake/Modules/FindSndFile.cmake b/build_files/cmake/Modules/FindSndFile.cmake index ef6fb73598f..eabc08b0645 100644 --- a/build_files/cmake/Modules/FindSndFile.cmake +++ b/build_files/cmake/Modules/FindSndFile.cmake @@ -24,11 +24,11 @@ # If LIBSNDFILE_ROOT_DIR was defined in the environment, use it. IF(NOT LIBSNDFILE_ROOT_DIR AND NOT $ENV{LIBSNDFILE_ROOT_DIR} STREQUAL "") - SET(LIBSNDFILE_ROOT_DIR $ENV{LIBSNDFILE_ROOT_DIR}) + SET(LIBSNDFILE_ROOT_DIR $ENV{LIBSNDFILE_ROOT_DIR}) ENDIF() SET(_sndfile_SEARCH_DIRS - ${LIBSNDFILE_ROOT_DIR} + ${LIBSNDFILE_ROOT_DIR} /usr/local /sw # Fink /opt/local # DarwinPorts @@ -54,14 +54,14 @@ FIND_LIBRARY(LIBSNDFILE_LIBRARY # all listed variables are TRUE INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(SndFile DEFAULT_MSG - LIBSNDFILE_LIBRARY LIBSNDFILE_INCLUDE_DIR) + LIBSNDFILE_LIBRARY LIBSNDFILE_INCLUDE_DIR) IF(LIBSNDFILE_FOUND) - SET(LIBSNDFILE_LIBRARIES ${LIBSNDFILE_LIBRARY}) - SET(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE_INCLUDE_DIR}) + SET(LIBSNDFILE_LIBRARIES ${LIBSNDFILE_LIBRARY}) + SET(LIBSNDFILE_INCLUDE_DIRS ${LIBSNDFILE_INCLUDE_DIR}) ENDIF(LIBSNDFILE_FOUND) MARK_AS_ADVANCED( - LIBSNDFILE_INCLUDE_DIR - LIBSNDFILE_LIBRARY + LIBSNDFILE_INCLUDE_DIR + LIBSNDFILE_LIBRARY ) diff --git a/build_files/cmake/Modules/GTestTesting.cmake b/build_files/cmake/Modules/GTestTesting.cmake index dd80013cb91..eb06e00bf9e 100644 --- a/build_files/cmake/Modules/GTestTesting.cmake +++ b/build_files/cmake/Modules/GTestTesting.cmake @@ -13,55 +13,55 @@ #============================================================================= macro(BLENDER_SRC_GTEST_EX NAME SRC EXTRA_LIBS DO_ADD_TEST) - if(WITH_GTESTS) - get_property(_current_include_directories - DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - PROPERTY INCLUDE_DIRECTORIES) - set(TEST_INC - ${_current_include_directories} - ${CMAKE_SOURCE_DIR}/tests/gtests - ${GLOG_INCLUDE_DIRS} - ${GFLAGS_INCLUDE_DIRS} - ${CMAKE_SOURCE_DIR}/extern/gtest/include - ${CMAKE_SOURCE_DIR}/extern/gmock/include - ) - unset(_current_include_directories) + if(WITH_GTESTS) + get_property(_current_include_directories + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + PROPERTY INCLUDE_DIRECTORIES) + set(TEST_INC + ${_current_include_directories} + ${CMAKE_SOURCE_DIR}/tests/gtests + ${GLOG_INCLUDE_DIRS} + ${GFLAGS_INCLUDE_DIRS} + ${CMAKE_SOURCE_DIR}/extern/gtest/include + ${CMAKE_SOURCE_DIR}/extern/gmock/include + ) + unset(_current_include_directories) - add_executable(${NAME}_test ${SRC}) - target_link_libraries(${NAME}_test - ${EXTRA_LIBS} - ${PLATFORM_LINKLIBS} - bf_testing_main - bf_intern_eigen - bf_intern_guardedalloc - extern_gtest - extern_gmock - # needed for glog - ${PTHREADS_LIBRARIES} - ${GLOG_LIBRARIES} - ${GFLAGS_LIBRARIES}) - if(WITH_OPENMP_STATIC) - target_link_libraries(${NAME}_test ${OpenMP_LIBRARIES}) - endif() - set_target_properties(${NAME}_test PROPERTIES - RUNTIME_OUTPUT_DIRECTORY "${TESTS_OUTPUT_DIR}" - RUNTIME_OUTPUT_DIRECTORY_RELEASE "${TESTS_OUTPUT_DIR}" - RUNTIME_OUTPUT_DIRECTORY_DEBUG "${TESTS_OUTPUT_DIR}" - INCLUDE_DIRECTORIES "${TEST_INC}") - if(${DO_ADD_TEST}) - add_test(NAME ${NAME}_test COMMAND ${TESTS_OUTPUT_DIR}/${NAME}_test WORKING_DIRECTORY $<TARGET_FILE_DIR:blender>) - endif() - endif() + add_executable(${NAME}_test ${SRC}) + target_link_libraries(${NAME}_test + ${EXTRA_LIBS} + ${PLATFORM_LINKLIBS} + bf_testing_main + bf_intern_eigen + bf_intern_guardedalloc + extern_gtest + extern_gmock + # needed for glog + ${PTHREADS_LIBRARIES} + ${GLOG_LIBRARIES} + ${GFLAGS_LIBRARIES}) + if(WITH_OPENMP_STATIC) + target_link_libraries(${NAME}_test ${OpenMP_LIBRARIES}) + endif() + set_target_properties(${NAME}_test PROPERTIES + RUNTIME_OUTPUT_DIRECTORY "${TESTS_OUTPUT_DIR}" + RUNTIME_OUTPUT_DIRECTORY_RELEASE "${TESTS_OUTPUT_DIR}" + RUNTIME_OUTPUT_DIRECTORY_DEBUG "${TESTS_OUTPUT_DIR}" + INCLUDE_DIRECTORIES "${TEST_INC}") + if(${DO_ADD_TEST}) + add_test(NAME ${NAME}_test COMMAND ${TESTS_OUTPUT_DIR}/${NAME}_test WORKING_DIRECTORY $<TARGET_FILE_DIR:blender>) + endif() + endif() endmacro() macro(BLENDER_SRC_GTEST NAME SRC EXTRA_LIBS) - BLENDER_SRC_GTEST_EX("${NAME}" "${SRC}" "${EXTRA_LIBS}" "TRUE") + BLENDER_SRC_GTEST_EX("${NAME}" "${SRC}" "${EXTRA_LIBS}" "TRUE") endmacro() macro(BLENDER_TEST NAME EXTRA_LIBS) - BLENDER_SRC_GTEST_EX("${NAME}" "${NAME}_test.cc" "${EXTRA_LIBS}" "TRUE") + BLENDER_SRC_GTEST_EX("${NAME}" "${NAME}_test.cc" "${EXTRA_LIBS}" "TRUE") endmacro() macro(BLENDER_TEST_PERFORMANCE NAME EXTRA_LIBS) - BLENDER_SRC_GTEST_EX("${NAME}" "${NAME}_test.cc" "${EXTRA_LIBS}" "FALSE") + BLENDER_SRC_GTEST_EX("${NAME}" "${NAME}_test.cc" "${EXTRA_LIBS}" "FALSE") endmacro() |