From: vsr Date: Tue, 20 Aug 2013 10:01:55 +0000 (+0000) Subject: CMake build procedure improvements: X-Git-Tag: begin_agr_portmanager_branch_131004~54 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=930f928545421beb78c1cfcefcc7daecd15f622f;p=modules%2Fkernel.git CMake build procedure improvements: - Doxygen staff --- diff --git a/salome_adm/cmake_files/FindSalomeDoxygen.cmake b/salome_adm/cmake_files/FindSalomeDoxygen.cmake index 430f1b438..b217886d3 100644 --- a/salome_adm/cmake_files/FindSalomeDoxygen.cmake +++ b/salome_adm/cmake_files/FindSalomeDoxygen.cmake @@ -23,6 +23,18 @@ # # !! Please read the generic detection procedure in SalomeMacros.cmake !! # +# Additional variables: +# +# DOXYGEN_SUPPORT_STL (string) [advanced] : set to YES if doxygen properly manages STL files +# or to NO otherwise (version 1.4.4 or older); see description of +# BUILTIN_STL_SUPPORT configuration variable in the doxygen documentation SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Doxygen DOXYGEN_EXECUTABLE 2) -#MARK_AS_ADVANCED() +IF(DOXYGEN_FOUND) + IF(DOXYGEN_VERSION VERSION_LESS "1.4.5") + SET(DOXYGEN_SUPPORT_STL NO) + ELSE() + SET(DOXYGEN_SUPPORT_STL YES) + ENDIF() +ENDIF() +MARK_AS_ADVANCED(DOXYGEN_SUPPORT_STL)