From 772ec9098a6bd086a5fa74588d507edca23cff20 Mon Sep 17 00:00:00 2001 From: Vyacheslav Napadovsky Date: Mon, 13 Jun 2016 04:27:39 +0300 Subject: [PATCH] OpenMP enabled for Sub3D --- CMakeLists.txt | 13 ++++++------- Sub3D | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ecc6bd..6b0fd34 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,4 @@ cmake_minimum_required(VERSION 2.8) -list(REMOVE_ITEM CMAKE_CONFIGURATION_TYPES MinSizeRel RelWithDebInfo) include(utils.cmake) project(ssifSource) @@ -18,12 +17,12 @@ add_definitions(-D _UNICODE) add_subdirectory(thirdparty) -#find_package(OpenMP) -#if(OPENMP_FOUND) -# set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") -# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") -# set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}") -#endif() +find_package(OpenMP) +if(OPENMP_FOUND) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}") +endif() add_subdirectory(CoreAVCWrapper) add_subdirectory(FilmTester) diff --git a/Sub3D b/Sub3D index 550d68d..140b2ee 160000 --- a/Sub3D +++ b/Sub3D @@ -1 +1 @@ -Subproject commit 550d68de396bc4d51acd0e8d1b46ba0934a00557 +Subproject commit 140b2ee453e6ebf51ba3c3a5346174ddfec5c105