macOS: remove old OpenMP lib stuff from cmake
authorArto Kitula <arto.kitula@gmail.com>
Mon, 6 Nov 2017 21:54:35 +0000 (23:54 +0200)
committerArto Kitula <arto.kitula@gmail.com>
Mon, 6 Nov 2017 21:54:35 +0000 (23:54 +0200)
CMakeLists.txt
build_files/cmake/platform/platform_apple.cmake
source/creator/CMakeLists.txt

index 0bef370..359e51a 100644 (file)
@@ -1422,10 +1422,6 @@ if(CMAKE_COMPILER_IS_GNUCC)
 
 elseif(CMAKE_C_COMPILER_ID MATCHES "Clang")
 
-       if(APPLE AND WITH_OPENMP) # we need the Intel omp lib linked here to not fail all tests due presence of -fopenmp !
-               set(CMAKE_REQUIRED_FLAGS "-L${LIBDIR}/openmp/lib -liomp5") # these are only used for the checks
-       endif()
-
        # strange, clang complains these are not supported, but then uses them.
        ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)
        ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ERROR_IMPLICIT_FUNCTION_DECLARATION -Werror=implicit-function-declaration)
index fcdebbb..1435572 100644 (file)
@@ -388,22 +388,6 @@ if(WITH_OPENMP)
                set(WITH_OPENMP OFF)
        else() # vanilla gcc or clang_omp support OpenMP
                message(STATUS "Using special OpenMP enabled compiler !") # letting find_package(OpenMP) module work for gcc
-               if(CMAKE_C_COMPILER_ID MATCHES "Clang") # clang-omp in darwin libs
-                       set(OPENMP_FOUND ON)
-                       set(OpenMP_C_FLAGS "-fopenmp" CACHE STRING "C compiler flags for OpenMP parallization" FORCE)
-                       set(OpenMP_CXX_FLAGS "-fopenmp" CACHE STRING "C++ compiler flags for OpenMP parallization" FORCE)
-                       include_directories(${LIBDIR}/openmp/include)
-                       link_directories(${LIBDIR}/openmp/lib)
-                       # This is a workaround for our helperbinaries ( datatoc, masgfmt, ... ),
-                       # They are linked also to omp lib, so we need it in builddir for runtime exexcution,
-                       # TODO: remove all unneeded dependencies from these
-
-                       # for intermediate binaries, in respect to lib ID
-                       execute_process(
-                               COMMAND ditto -arch ${CMAKE_OSX_ARCHITECTURES}
-                               ${LIBDIR}/openmp/lib/libiomp5.dylib
-                               ${CMAKE_BINARY_DIR}/Resources/lib/libiomp5.dylib)
-               endif()
        endif()
 endif()
 
index 54a212f..2bda651 100644 (file)
@@ -894,18 +894,6 @@ elseif(APPLE)
                blender.app/Contents/
        )
 
-       if(WITH_OPENMP AND CMAKE_C_COMPILER_ID MATCHES "Clang" AND NOT ${CMAKE_C_COMPILER_VERSION} VERSION_LESS '3.4')
-               install(
-                       FILES ${LIBDIR}/openmp/lib/libiomp5.dylib
-                       DESTINATION blender.app/Contents/Resources/lib/
-               )
-               install(
-                       FILES ${LIBDIR}/openmp/LICENSE.txt
-                       DESTINATION "."
-                       RENAME LICENSE-libiomp5.txt
-               )
-       endif()
-
        if(WITH_LLVM AND NOT LLVM_STATIC)
                install(
                        FILES ${LIBDIR}/llvm/lib/libLLVM-3.4.dylib