X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=2b5c5f9feac3156028ca9b1553062db33a44c6ec;hb=219bcc22ff3fcf4bda266470b7c78bb1d8be9925;hp=a1159ab3753b3f5f1ced9954818385ee55b570f5;hpb=41a74698bb0203749248628baa1503144e1f12f7;p=creaVtk.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1159ab..2b5c5f9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,6 +61,8 @@ SET(PROJECT_VERSION_DATE "11/02/2010")
 #ADD_DEFINITIONS( -DPROJECT_VERSION=${PROJECT_VERSION} )
 #ADD_DEFINITIONS( -DPROJECT_VERSION_DATE=${PROJECT_VERSION_DATE} )
 
+
+
 # JPR 4 mars 2011
 set (CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Module)
 
@@ -74,6 +76,61 @@ IF (crea_FOUND)
 ENDIF(crea_FOUND)
 #==================================
 
+
+#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}")
+#    message(EED  oooopppppeeeeennnnmmmmmppppp ${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS} )
+#ENDIF()
+#message(EED  oooopppppeeeeennnnmmmmmppppp ${OpenMP_FOUND} )
+
+
+### Find OpenMP
+if(APPLE )
+    if(CMAKE_C_COMPILER_ID MATCHES "Clang")
+        set(OpenMP_C "${CMAKE_C_COMPILER}")
+        set(OpenMP_C_FLAGS "-Xclang -fopenmp=libomp -Wno-unused-command-line-argument")
+        set(OpenMP_C_LIB_NAMES "libomp" "libgomp" "libiomp5")
+        set(OpenMP_libomp_LIBRARY ${OpenMP_C_LIB_NAMES})
+        set(OpenMP_libgomp_LIBRARY ${OpenMP_C_LIB_NAMES})
+        set(OpenMP_libiomp5_LIBRARY ${OpenMP_C_LIB_NAMES})
+    endif()
+    if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+      set(OpenMP_CXX "${CMAKE_CXX_COMPILER}")
+#      set(OpenMP_CXX_FLAGS "-fopenmp=libomp -Wno-unused-command-line-argument")
+      set(OpenMP_CXX_FLAGS "-Xclang -fopenmp -Wno-unused-command-line-argument")
+      set(OpenMP_CXX_LIB_NAMES "libomp" "libgomp" "libiomp5")
+      set(OpenMP_libomp_LIBRARY ${OpenMP_CXX_LIB_NAMES})
+      
+#EED 2022/05/15
+      set(OpenMP_libomp_LIBRARY_crea libomp.dylib )
+      
+      set(OpenMP_libgomp_LIBRARY ${OpenMP_CXX_LIB_NAMES})
+      set(OpenMP_libiomp5_LIBRARY ${OpenMP_CXX_LIB_NAMES})
+    endif()
+endif()
+  find_package(OpenMP REQUIRED)
+if (OPENMP_FOUND)
+#    include_directories("${OPENMP_INCLUDES}")
+    link_directories("${OPENMP_LIBRARIES}")
+    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(OPENMP_FOUND)
+
+message(EED  oooopppppeeeeennnnmmmmmppppp2222A ${OPENMP_FOUND} )
+message(EED  oooopppppeeeeennnnmmmmmppppp2222B ${OPENMP_INCLUDES} )
+message(EED  oooopppppeeeeennnnmmmmmppppp2222C ${OpenMP_libomp_LIBRARY} )
+message(EED  oooopppppeeeeennnnmmmmmppppp2222D ${OpenMP_CXX_FLAGS} )
+message(EED  oooopppppeeeeennnnmmmmmppppp2222E ${OpenMP_CXX_LIBRARIES} )
+
+
+
+
+
+
+
 # USER! : Add here as many 'FIND_PACKAGE' blocks as *your* aplication requires
 # -----
 
@@ -104,7 +161,7 @@ SET(USE_GDCM2     OFF)
 SET(USE_WXWIDGETS OFF)
 SET(USE_KWWIDGETS OFF)
 SET(USE_VTK       ON)
-SET(USE_ITK       ON)
+SET(USE_ITK       OFF)
 SET(USE_BOOST     OFF)
 
 #==================================
@@ -202,3 +259,7 @@ ADD_SUBDIRECTORY(install)
 # USER : you may use it
 # ----
 ADD_SUBDIRECTORY(bbtk_creaVtk_PKG)
+#ADD_SUBDIRECTORY(bbtk_creaVtkHeartAngles_PKG)
+
+
+