Correction of the previous wrong commit.

diff --git a/cmake/FindSalomeOpenCASCADE.cmake b/cmake/FindSalomeOpenCASCADE.cmake
index 0c1612d96824de3a052685e4fbd9b76b9bad3b4e..6b0b67910e7cef27179d49151e53e87b13939742 100644 (file)
--- a/cmake/FindSalomeOpenCASCADE.cmake
+++ b/cmake/FindSalomeOpenCASCADE.cmake
@@ -37,40 +37,10 @@ IF(OpenCASCADE_FOUND)
   SET(OpenCascade_DEFINITIONS ${OpenCASCADE_C_FLAGS} ${OpenCASCADE_CXX_FLAGS})
   SET(OpenCascade_LDFLAGS ${OpenCASCADE_LINKER_FLAGS})
 
-<<<<<<< HEAD
-=======
-  # Workaround: detect and add freetype to CAS_INCLUDE_DIRS
-  # It will be suppressed after the correction of the several bugs in
-  # the OCCT CMake configuration.
-  IF(OpenCASCADE_VERSION VERSION_LESS "7.1.1")
-    SET(Freetype_DIR $ENV{FREETYPE_ROOT_DIR})
-    FIND_PACKAGE(Freetype)
-  
-    # Standard CMake Findfreetype.cmake doesn't find ft2build.h, do it manually:
-    # 1. Find custom freetype
-    FIND_PATH( FREETYPE_INCLUDE_DIR_ft2build ft2build.h
-            PATHS $ENV{FREETYPE_ROOT_DIR}
-            PATH_SUFFIXES include/freetype2 include freetype2
-            NO_DEFAULT_PATH )
-
-    # 2. Find native freetype, if custom doesn't found:
-    IF(NOT FREETYPE_INCLUDE_DIR_ft2build)
-      FIND_PATH( FREETYPE_INCLUDE_DIR_ft2build ft2build.h
-                        PATH_SUFFIXES include/freetype2 include freetype2 )
-    ENDIF()
-    SET(OpenCASCADE_INCLUDE_DIR ${OpenCASCADE_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIR_freetype2} ${FREETYPE_INCLUDE_DIR_ft2build})
-  ENDIF()
-  # End of workaround
-
->>>>>>> 4dd1a900f5d1cc1ca3644fd16023ffb228e0ded5
   SALOME_ACCUMULATE_HEADERS(OpenCASCADE_INCLUDE_DIR)
   SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${OpenCASCADE_LIBRARY_DIR})
 
 ELSE()
-<<<<<<< HEAD
-=======
-  # TODO: Detect OpenCASCADE if it is distributed without CMake configuration.
->>>>>>> 4dd1a900f5d1cc1ca3644fd16023ffb228e0ded5
   IF(NOT CAS_FIND_QUIETLY)
     MESSAGE(STATUS "Could not find OpenCASCADE ...")
   ENDIF()