From: rnv Date: Tue, 7 Mar 2017 14:35:28 +0000 (+0300) Subject: Build SALOME on Fedora-24 with native products. X-Git-Tag: SHAPER_2.7.0~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=466e112648d9b2fd5dc35775a3d30cda8a028159;p=tools%2Fconfiguration.git Build SALOME on Fedora-24 with native products. --- diff --git a/cmake/FindNetgen.cmake b/cmake/FindNetgen.cmake index 380b6a9..d4ee3f0 100644 --- a/cmake/FindNetgen.cmake +++ b/cmake/FindNetgen.cmake @@ -48,7 +48,6 @@ IF(WIN32) FILE(TO_CMAKE_PATH ${NETGEN_ROOT_DIR}/cmake NETGEN_CMAKE_FILES) LIST(APPEND CMAKE_MODULE_PATH ${NETGEN_CMAKE_FILES}) SET(ZLIB_ROOT_DIR $ENV{ZLIB_ROOT_DIR}) - MESSAGE("RNV ${ZLIB_ROOT_DIR}") INCLUDE(FindZlib) ENDIF() ENDIF() diff --git a/cmake/FindOpenCV.cmake b/cmake/FindOpenCV.cmake index 8d0b141..ac601b6 100644 --- a/cmake/FindOpenCV.cmake +++ b/cmake/FindOpenCV.cmake @@ -1,160 +1,60 @@ -########################################################### -# Find OpenCV Library -# See http://sourceforge.net/projects/opencvlibrary/ -#---------------------------------------------------------- -# -## 1: Setup: -# The following variables are optionally searched for defaults -# OpenCV_DIR: Base directory of OpenCv tree to use. -# -## 2: Variable -# The following are set after configuration is done: -# -# OpenCV_FOUND -# OpenCV_LIBS -# OpenCV_INCLUDE_DIR -# OpenCV_VERSION (OpenCV_VERSION_MAJOR, OpenCV_VERSION_MINOR, OpenCV_VERSION_PATCH) -# -# -# Deprecated variable are used to maintain backward compatibility with -# the script of Jan Woetzel (2006/09): www.mip.informatik.uni-kiel.de/~jw -# OpenCV_INCLUDE_DIRS -# OpenCV_LIBRARIES -# OpenCV_LINK_DIRECTORIES -# -## 3: Version -# -# 2010/04/07 Benoit Rat, Correct a bug when OpenCVConfig.cmake is not found. -# 2010/03/24 Benoit Rat, Add compatibility for when OpenCVConfig.cmake is not found. -# 2010/03/22 Benoit Rat, Creation of the script. -# -# -# tested with: -# - OpenCV 2.1: MinGW, MSVC2008 -# - OpenCV 2.0: MinGW, MSVC2008, GCC4 -# -# -## 4: Licence: -# -# LGPL 2.1 : GNU Lesser General Public License Usage -# Alternatively, this file may be used under the terms of the GNU Lesser - -# General Public License version 2.1 as published by the Free Software -# Foundation and appearing in the file LICENSE.LGPL included in the -# packaging of this file. Please review the following information to -# ensure the GNU Lesser General Public License version 2.1 requirements -# will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -# -#---------------------------------------------------------- - - -find_path(OpenCV_DIR "OpenCVConfig.cmake" DOC "Root directory of OpenCV") - -##==================================================== -## Find OpenCV libraries -##---------------------------------------------------- -if(EXISTS "${OpenCV_DIR}") - - #When its possible to use the Config script use it. - if(EXISTS "${OpenCV_DIR}/OpenCVConfig.cmake") - - ## Include the standard CMake script - include("${OpenCV_DIR}/OpenCVConfig.cmake") - - ## Search for a specific version - set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}") - - #Otherwise it try to guess it. - else(EXISTS "${OpenCV_DIR}/OpenCVConfig.cmake") - - set(OPENCV_LIB_COMPONENTS cxcore cv ml highgui cvaux) - find_path(OpenCV_INCLUDE_DIR "cv.h" PATHS "${OpenCV_DIR}" PATH_SUFFIXES "include" "include/opencv" DOC "") - if(EXISTS ${OpenCV_INCLUDE_DIR}) - include_directories(${OpenCV_INCLUDE_DIR}) - endif(EXISTS ${OpenCV_INCLUDE_DIR}) - - #Find OpenCV version by looking at cvver.h - file(STRINGS ${OpenCV_INCLUDE_DIR}/cvver.h OpenCV_VERSIONS_TMP REGEX "^#define CV_[A-Z]+_VERSION[ \t]+[0-9]+$") - string(REGEX REPLACE ".*#define CV_MAJOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_MAJOR ${OpenCV_VERSIONS_TMP}) - string(REGEX REPLACE ".*#define CV_MINOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_MINOR ${OpenCV_VERSIONS_TMP}) - string(REGEX REPLACE ".*#define CV_SUBMINOR_VERSION[ \t]+([0-9]+).*" "\\1" OpenCV_VERSION_PATCH ${OpenCV_VERSIONS_TMP}) - set(OpenCV_VERSION ${OpenCV_VERSION_MAJOR}.${OpenCV_VERSION_MINOR}.${OpenCV_VERSION_PATCH} CACHE STRING "" FORCE) - set(CVLIB_SUFFIX "${OpenCV_VERSION_MAJOR}${OpenCV_VERSION_MINOR}${OpenCV_VERSION_PATCH}") - - endif(EXISTS "${OpenCV_DIR}/OpenCVConfig.cmake") - - - - - ## Initiate the variable before the loop - set(GLOBAL OpenCV_LIBS "") - set(OpenCV_FOUND_TMP true) - - ## Loop over each components - foreach(__CVLIB ${OPENCV_LIB_COMPONENTS}) - - find_library(OpenCV_${__CVLIB}_LIBRARY_DEBUG NAMES "${__CVLIB}${CVLIB_SUFFIX}d" "lib${__CVLIB}${CVLIB_SUFFIX}d" PATHS "${OpenCV_DIR}/lib" NO_DEFAULT_PATH) - find_library(OpenCV_${__CVLIB}_LIBRARY_RELEASE NAMES "${__CVLIB}${CVLIB_SUFFIX}" "lib${__CVLIB}${CVLIB_SUFFIX}" PATHS "${OpenCV_DIR}/lib" NO_DEFAULT_PATH) - - #Remove the cache value - set(OpenCV_${__CVLIB}_LIBRARY "" CACHE STRING "" FORCE) - - #both debug/release - if(OpenCV_${__CVLIB}_LIBRARY_DEBUG AND OpenCV_${__CVLIB}_LIBRARY_RELEASE) - set(OpenCV_${__CVLIB}_LIBRARY debug ${OpenCV_${__CVLIB}_LIBRARY_DEBUG} optimized ${OpenCV_${__CVLIB}_LIBRARY_RELEASE} CACHE STRING "" FORCE) - #only debug - elseif(OpenCV_${__CVLIB}_LIBRARY_DEBUG) - set(OpenCV_${__CVLIB}_LIBRARY ${OpenCV_${__CVLIB}_LIBRARY_DEBUG} CACHE STRING "" FORCE) - #only release - elseif(OpenCV_${__CVLIB}_LIBRARY_RELEASE) - set(OpenCV_${__CVLIB}_LIBRARY ${OpenCV_${__CVLIB}_LIBRARY_RELEASE} CACHE STRING "" FORCE) - #no library found - else() - set(OpenCV_FOUND_TMP false) - endif() - - #Add to the general list - if(OpenCV_${__CVLIB}_LIBRARY) - set(OpenCV_LIBS ${OpenCV_LIBS} ${OpenCV_${__CVLIB}_LIBRARY}) - endif(OpenCV_${__CVLIB}_LIBRARY) - - endforeach(__CVLIB) - - - set(OpenCV_FOUND ${OpenCV_FOUND_TMP} CACHE BOOL "" FORCE) - - -else(EXISTS "${OpenCV_DIR}") - set(ERR_MSG "Please specify OpenCV directory using OpenCV_DIR env. variable") -endif(EXISTS "${OpenCV_DIR}") -##==================================================== - - -##==================================================== -## Print message -##---------------------------------------------------- -if(NOT OpenCV_FOUND) - # make FIND_PACKAGE friendly - if(NOT OpenCV_FIND_QUIETLY) - if(OpenCV_FIND_REQUIRED) - message(FATAL_ERROR "OpenCV required but some headers or libs not found. ${ERR_MSG}") - else(OpenCV_FIND_REQUIRED) - message(STATUS "WARNING: OpenCV was not found. ${ERR_MSG}") - endif(OpenCV_FIND_REQUIRED) - endif(NOT OpenCV_FIND_QUIETLY) -endif(NOT OpenCV_FOUND) -##==================================================== - - -##==================================================== -## Backward compatibility -##---------------------------------------------------- -if(OpenCV_FOUND) - option(OpenCV_BACKWARD_COMPA "Add some variable to make this script compatible with the other version of FindOpenCV.cmake" false) - if(OpenCV_BACKWARD_COMPA) - find_path(OpenCV_INCLUDE_DIRS "cv.h" PATHS "${OpenCV_DIR}" PATH_SUFFIXES "include" "include/opencv" DOC "Include directory") - find_path(OpenCV_INCLUDE_DIR "cv.h" PATHS "${OpenCV_DIR}" PATH_SUFFIXES "include" "include/opencv" DOC "Include directory") - set(OpenCV_LIBRARIES "${OpenCV_LIBS}" CACHE STRING "" FORCE) - endif(OpenCV_BACKWARD_COMPA) -endif(OpenCV_FOUND) -##==================================================== \ No newline at end of file +######################################################################### +# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +# +# Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# + +# - Find OpenCV +# Sets the following variables: +# OpenCV_FOUND - found flag +# OpenCV_INCLUDE_DIRS - path to the OpenCV include directories +# OpenCV_LIBS - path to the OpenCV libraries to be linked against +# + +IF(NOT OpenCV_FIND_QUIETLY) + MESSAGE(STATUS "Check for OpenCV ...") +ENDIF() + +FIND_PATH(OpenCV_INCLUDE_DIRS cv.h PATH_SUFFIXES opencv) +IF(OpenCV_INCLUDE_DIRS) + SET(_OpenCV_INCLUDE_DIR_TMP "${OpenCV_INCLUDE_DIRS}/../opencv2") + GET_FILENAME_COMPONENT(_OpenCV_INCLUDE_DIR_TMP "${_OpenCV_INCLUDE_DIR_TMP}" REALPATH) + LIST(APPEND OpenCV_INCLUDE_DIRS ${_OpenCV_INCLUDE_DIR_TMP}) +ENDIF() + +SET(OpenCV_LIB_COMPONENTS videostab;video;ts;superres;stitching;photo;ocl;objdetect;ml;legacy;imgproc;highgui;gpu;flann;features2d) + +FOREACH(_compo ${OpenCV_LIB_COMPONENTS}) + FIND_LIBRARY(OpenCV_${_compo} opencv_${_compo}) + IF(OpenCV_${_compo}) + LIST(APPEND OpenCV_LIBRARIES ${OpenCV_${_compo}}) + ENDIF() +ENDFOREACH() +IF(OpenCV_LIBRARIES AND OpenCV_INCLUDE_DIRS) + SET(OpenCV_FOUND 1) + + IF(NOT OpenCV_FIND_QUIETLY) + MESSAGE("OpenCV found !") + ENDIF() +ELSE() + IF(NOT OpenCV_FIND_QUIETLY) + MESSAGE("Could not find OpenCV ...") + ENDIF() +ENDIF() diff --git a/cmake/FindSalomeOpenCV.cmake b/cmake/FindSalomeOpenCV.cmake index bcab5e7..aa0049c 100644 --- a/cmake/FindSalomeOpenCV.cmake +++ b/cmake/FindSalomeOpenCV.cmake @@ -31,8 +31,9 @@ ENDIF (WIN32) SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(OpenCV OpenCV_DIR ${UpCount}) -#MARK_AS_ADVANCED() - IF(OpenCV_FOUND) SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${OpenCV_LIBRARIES}) + IF(NOT OPENCV_INCLUDE_DIR AND OpenCV_INCLUDE_DIRS) + SET(OPENCV_INCLUDE_DIR ${OpenCV_INCLUDE_DIRS}) + ENDIF() ENDIF() diff --git a/cmake/FindSphinx.cmake b/cmake/FindSphinx.cmake index 26aa3f0..9914763 100644 --- a/cmake/FindSphinx.cmake +++ b/cmake/FindSphinx.cmake @@ -27,8 +27,12 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -FIND_PROGRAM(SPHINX_EXECUTABLE sphinx-build PATH_SUFFIXES Scripts) -FIND_PROGRAM(SPHINX_APIDOC_EXECUTABLE sphinx-apidoc PATH_SUFFIXES Scripts) +FIND_PROGRAM(SPHINX_EXECUTABLE + NAMES sphinx-build sphinx-build-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} + PATH_SUFFIXES Scripts) +FIND_PROGRAM(SPHINX_APIDOC_EXECUTABLE + NAMES sphinx-apidoc sphinx-apidoc-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} + PATH_SUFFIXES Scripts) # Get root dir locally, going up two levels from the exec: GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${SPHINX_EXECUTABLE}" PATH)