From 4966456221c12508c4c618f58a46fcb8a93d832c Mon Sep 17 00:00:00 2001 From: abd Date: Tue, 18 Nov 2008 11:14:08 +0000 Subject: [PATCH] Integration request 0020026 A contribution to compile GUI module with cmake by Erwan ADAM + build_cmake file converts Makefile.am to cmake files + adm_local/cmake_files contens all configuration files for products --- adm_local/Makefile.am | 2 +- adm_local/cmake_files/FindCAS.cmake | 154 ++++++++++++++++++++++++ adm_local/cmake_files/FindOPENGL.cmake | 6 + adm_local/cmake_files/FindQT4.cmake | 12 ++ adm_local/cmake_files/FindQWT.cmake | 12 ++ adm_local/cmake_files/FindSIPPYQT.cmake | 30 +++++ adm_local/cmake_files/FindVTK.cmake | 27 +++++ adm_local/cmake_files/Makefile.am | 27 +++++ adm_local/unix/make_common_starter.am | 3 + build_cmake | 9 ++ configure.ac | 1 + 11 files changed, 282 insertions(+), 1 deletion(-) create mode 100644 adm_local/cmake_files/FindCAS.cmake create mode 100644 adm_local/cmake_files/FindOPENGL.cmake create mode 100644 adm_local/cmake_files/FindQT4.cmake create mode 100644 adm_local/cmake_files/FindQWT.cmake create mode 100644 adm_local/cmake_files/FindSIPPYQT.cmake create mode 100644 adm_local/cmake_files/FindVTK.cmake create mode 100644 adm_local/cmake_files/Makefile.am create mode 100755 build_cmake diff --git a/adm_local/Makefile.am b/adm_local/Makefile.am index 7ae83a6fc..44db82370 100644 --- a/adm_local/Makefile.am +++ b/adm_local/Makefile.am @@ -16,4 +16,4 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -SUBDIRS = unix +SUBDIRS = unix cmake_files diff --git a/adm_local/cmake_files/FindCAS.cmake b/adm_local/cmake_files/FindCAS.cmake new file mode 100644 index 000000000..578affb44 --- /dev/null +++ b/adm_local/cmake_files/FindCAS.cmake @@ -0,0 +1,154 @@ + +SET(CASROOT $ENV{CASROOT}) + +SET(OCC_VERSION_MAJOR 6) +SET(OCC_VERSION_MINOR 3) +SET(OCC_VERSION_MAINTENANCE 0) + +SET(CAS_CPPFLAGS) +SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DOCC_VERSION_MAJOR=${OCC_VERSION_MAJOR}) +SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DOCC_VERSION_MINOR=${OCC_VERSION_MINOR}) +SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DOCC_VERSION_MAINTENANCE=${OCC_VERSION_MAINTENANCE}) +SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DLIN -DLINTEL -DCSFDB) +SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DNo_exception) +SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DHAVE_CONFIG_H) +SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -DHAVE_LIMITS_H) +SET(CAS_CPPFLAGS ${CAS_CPPFLAGS} -I${CASROOT}/inc) + +IF(WINDOWS) + SET(CASROOT_LIBDIR ${CASROOT}/win32/libd) +ELSE(WINDOWS) + SET(CASROOT_LIBDIR ${CASROOT}/lib) +ENDIF(WINDOWS) + +FIND_LIBRARY(TKernel TKernel PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKMath TKMath PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKV3d TKV3d PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKCDF TKCDF PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKLCAF TKLCAF PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKService TKService PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKBRep TKBRep PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKGeomBase TKGeomBase PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKOpenGl TKOpenGl PATHS ${CASROOT_LIBDIR}) +FIND_LIBRARY(TKG3d TKG3d PATHS ${CASROOT_LIBDIR}) + +SET(CAS_KERNEL ${TKernel} ${TKMath}) +SET(CAS_TKV3d ${TKernel} ${TKMath} ${TKV3d}) +SET(CAS_OCAF ${TKernel} ${TKCDF} ${TKLCAF}) +SET(CAS_VIEWER ${TKService} ${TKV3d} ${TKG3d} ${TKGeomBase} ${TKBRep}) + +#SET(CAS_VIEWER ${TKService}) # From check_cas .m4 +#SET(CAS_VIEWER ${CAS_VIEWER} ${CAS_TKV3d} ${CAS_TKBRep}) # Add-ons E.A. + + + + + + + +#SET(CAS_CXXFLAGS) + +#FIND_LIBRARY(BinLPlugin BinLPlugin PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(BinPlugin BinPlugin PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(BinXCAFPlugin BinXCAFPlugin PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(FWOSPlugin FWOSPlugin PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(mscmd mscmd PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(PTKernel PTKernel PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(StdLPlugin StdLPlugin PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(StdPlugin StdPlugin PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKAdvTools TKAdvTools PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKBinL TKBinL PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKBin TKBin PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKBinXCAF TKBinXCAF PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKBool TKBool PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKBO TKBO PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKCAF TKCAF PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKCDLFront TKCDLFront PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKCPPClient TKCPPClient PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKCPPExt TKCPPExt PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKCPPIntExt TKCPPIntExt PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKCPPJini TKCPPJini PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKCSFDBSchema TKCSFDBSchema PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKDCAF TKDCAF PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKDraw TKDraw PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKFeat TKFeat PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKFillet TKFillet PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKG2d TKG2d PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKGeomAlgo TKGeomAlgo PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKHLR TKHLR PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKIDLFront TKIDLFront PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKIGES TKIGES PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKMesh TKMesh PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKMeshVS TKMeshVS PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKOffset TKOffset PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKPCAF TKPCAF PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKPLCAF TKPLCAF PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKPrim TKPrim PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKPShape TKPShape PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKShapeSchema TKShapeSchema PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKShHealing TKShHealing PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKStdLSchema TKStdLSchema PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKStdSchema TKStdSchema PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKSTEP209 TKSTEP209 PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKSTEPAttr TKSTEPAttr PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKSTEPBase TKSTEPBase PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKSTEP TKSTEP PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKSTL TKSTL PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKTCPPExt TKTCPPExt PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKTopAlgo TKTopAlgo PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKTopTest TKTopTest PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKV2d TKV2d PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKViewerTest TKViewerTest PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKVRML TKVRML PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKWOK TKWOK PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKWOKTcl TKWOKTcl PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKXCAFSchema TKXCAFSchema PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKXCAF TKXCAF PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKXDEDRAW TKXDEDRAW PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKXDEIGES TKXDEIGES PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKXDESTEP TKXDESTEP PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKXmlL TKXmlL PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKXml TKXml PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKXmlXCAF TKXmlXCAF PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKXSBase TKXSBase PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(TKXSDRAW TKXSDRAW PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(wokcmd wokcmd PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(wokdeliverysteps wokdeliverysteps PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(wokdfltsteps wokdfltsteps PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(wokobjssteps wokobjssteps PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(wokorbixsteps wokorbixsteps PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(woksteps woksteps PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(woktoolscmd woktoolscmd PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(wokutilscmd wokutilscmd PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(XCAFPlugin XCAFPlugin PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(XmlLPlugin XmlLPlugin PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(XmlPlugin XmlPlugin PATHS ${CASROOT_LIBDIR}) +#FIND_LIBRARY(XmlXCAFPlugin XmlXCAFPlugin PATHS ${CASROOT_LIBDIR}) + + +#SET(CAS_MATH ${TKMath}) # From check_cas .m4 +#SET(CAS_MATH ${CAS_MATH} ${CAS_KERNEL}) # Add-ons E.A. + +#SET(CAS_STDPLUGIN ${StdPlugin}) # From check_cas .m4 + +#SET(CAS_TKBRep ${TKG2d} ${TKG3d} ${TKGeomBase} ${TKBRep}) # From check_cas .m4 + +#SET(CAS_OCAF ${PTKernel} ${TKernel} ${TKCDF} ${TKLCAF} ${TKPCAF} ${TKStdSchema}) # From check_cas .m4 + +#SET(CAS_OCAFVIS ${TKCAF} ${StdPlugin} ${StdLPlugin} ${TKPLCAF} ${TKPShape} ${TKStdLSchema} ${TKShapeSchema}) # From check_cas .m4 +#SET(CAS_OCAFVIS ${CAS_OCAFVIS} ${CAS_TKBRep} ${CAS_MATH}) # Add-ons E.A. + +#SET(CAS_TKV3d ${TKV3d}) # From check_cas .m4 +#SET(CAS_TKV3d ${CAS_TKV3d} ${CAS_KERNEL} ${CAS_MATH}) # Add-ons E.A. + + +#SET(CAS_TKTopAlgo ${CAS_TKBRep} ${TKGeomAlgo} ${TKTopAlgo}) # From check_cas .m4 + +#SET(CAS_TKPrim ${CAS_TKTopAlgo} ${TKPrim}) # From check_cas .m4 + +#SET(CAS_MODELER ${CAS_TKPrim} ${TKBO} ${TKBool} ${TKHLR} ${TKFillet} ${TKOffset} ${TKFeat}) # From check_cas .m4 +#SET(CAS_MODELER ${CAS_MODELER} ${CAS_MATH}) # Add-ons E.A. + +#SET(CAS_DATAEXCHANGE ${CAS_LDPATH} ${TKIGES} ${TKSTEP}) # From check_cas .m4 + +#SET(CAS_LDFLAGS ${CAS_KERNEL} ${CAS_MATH} ${CAS_OCAF} ${CAS_OCAFVIS} ${CAS_VIEWER} ${CAS_MODELER} ${CAS_DATAEXCHANGE}) diff --git a/adm_local/cmake_files/FindOPENGL.cmake b/adm_local/cmake_files/FindOPENGL.cmake new file mode 100644 index 000000000..34b09fcab --- /dev/null +++ b/adm_local/cmake_files/FindOPENGL.cmake @@ -0,0 +1,6 @@ + +IF(${WINDOWS}) + FIND_LIBRARY(OpenGL_LIB OpenGL32 "C:/Program Files/Microsoft SDKs/Windows/v6.0A/lib") + FIND_LIBRARY(GlU_LIB GlU32 "C:/Program Files/Microsoft SDKs/Windows/v6.0A/lib") + SET(OGL_LIBS ${OpenGL_LIB} ${GlU_LIB}) +ENDIF(${WINDOWS}) diff --git a/adm_local/cmake_files/FindQT4.cmake b/adm_local/cmake_files/FindQT4.cmake new file mode 100644 index 000000000..f416fb3fe --- /dev/null +++ b/adm_local/cmake_files/FindQT4.cmake @@ -0,0 +1,12 @@ + +INCLUDE(FindQt4) +INCLUDE(UseQt4) +SET(DIRS) +FOREACH(D ${QT_INCLUDES}) +SET(DIRS ${DIRS} -I${D}) +ENDFOREACH(D ${QT_INCLUDES}) +SET(QT_INCLUDES ${DIRS}) +SET(QT_INCLUDES ${QT_INCLUDES} -DQT_THREAD_SUPPORT) +SET(QT_MT_LIBS ${QT_LIBRARIES} ${QT_QTXML_LIBRARY} ${QT_QTOPENGL_LIBRARY}) + +FIND_PROGRAM(QT_LRELEASE_EXECUTABLE lrelease) diff --git a/adm_local/cmake_files/FindQWT.cmake b/adm_local/cmake_files/FindQWT.cmake new file mode 100644 index 000000000..157a31c3d --- /dev/null +++ b/adm_local/cmake_files/FindQWT.cmake @@ -0,0 +1,12 @@ + +SET(QWTHOME $ENV{QWTHOME}) +FIND_PATH(QWT_INCLUDE_DIR qwt_plot.h ${QWTHOME}/include) +SET(QWT_INCLUDES -I${QWT_INCLUDE_DIR}) +IF(WINDOWS) +SET(QWT_INCLUDES ${QWT_INCLUDES} -DQWT_DLL) +ENDIF(WINDOWS) +IF(WINDOWS) +FIND_LIBRARY(QWT_LIBS qwt5 ${QWTHOME}/lib) +ELSE(WINDOWS) +FIND_LIBRARY(QWT_LIBS qwt ${QWTHOME}/lib) +ENDIF(WINDOWS) diff --git a/adm_local/cmake_files/FindSIPPYQT.cmake b/adm_local/cmake_files/FindSIPPYQT.cmake new file mode 100644 index 000000000..844e26dca --- /dev/null +++ b/adm_local/cmake_files/FindSIPPYQT.cmake @@ -0,0 +1,30 @@ + +FIND_PROGRAM(SIP_EXECUTABLE sip) + +SET(SIP_ROOT ${SIP_EXECUTABLE}) +GET_FILENAME_COMPONENT(SIP_ROOT ${SIP_ROOT} PATH) +GET_FILENAME_COMPONENT(SIP_ROOT ${SIP_ROOT} PATH) + +SET(SIP_INCLUDES -I${SIP_ROOT}/include/python${PYTHON_VERSION}) + +FIND_PROGRAM(PYUIC_EXECUTABLE pyuic4) + +SET(PYUIC_ROOT ${PYUIC_EXECUTABLE}) +GET_FILENAME_COMPONENT(PYUIC_ROOT ${PYUIC_ROOT} PATH) +GET_FILENAME_COMPONENT(PYUIC_ROOT ${PYUIC_ROOT} PATH) + +IF(WINDOWS) + SET(PYQT_SIPS ${PYUIC_ROOT}/sip) +ELSE(WINDOWS) + SET(PYQT_SIPS ${PYUIC_ROOT}/share/sip) +ENDIF(WINDOWS) + +SET(PYQT_INCLUDES -I${PYQT_SIPS}) +SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtCore -I${PYQT_SIPS}/QtGui) +SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtXml -I${PYQT_SIPS}/QtOpenGL) +SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtAssistant -I${PYQT_SIPS}/QtDesigner) +SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtNetwork -I${PYQT_SIPS}/QtSql) +SET(PYQT_INCLUDES ${PYQT_INCLUDES} -I${PYQT_SIPS}/QtSvg -I${PYQT_SIPS}/QtTest) + +SET(PYQT_SIPFLAGS -x VendorID -x PyQt_NoPrintRangeBug -t WS_X11 -t Qt_4_4_1 -g -s .cc -c .) +SET(PYQT_SIPFLAGS ${PYQT_SIPFLAGS} ${PYQT_INCLUDES}) diff --git a/adm_local/cmake_files/FindVTK.cmake b/adm_local/cmake_files/FindVTK.cmake new file mode 100644 index 000000000..bf99ce9b1 --- /dev/null +++ b/adm_local/cmake_files/FindVTK.cmake @@ -0,0 +1,27 @@ + +INCLUDE(FindVTK) + +SET(VTK_INCLUDES) +FOREACH(dir ${VTK_INCLUDE_DIRS}) + SET(VTK_INCLUDES ${VTK_INCLUDES} -I${dir}) +ENDFOREACH(dir ${VTK_INCLUDE_DIRS}) + +SET(VTK_LIBS) +FIND_LIBRARY(VTK_COMMON vtkCommon ${VTK_LIBRARY_DIRS}) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_COMMON}) +FIND_LIBRARY(VTK_GRAPHICS vtkGraphics ${VTK_LIBRARY_DIRS}) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_GRAPHICS}) +FIND_LIBRARY(VTK_IMAGING vtkImaging ${VTK_LIBRARY_DIRS}) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_IMAGING}) +FIND_LIBRARY(VTK_FILTERING vtkFiltering ${VTK_LIBRARY_DIRS}) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_FILTERING}) +FIND_LIBRARY(VTK_IO vtkIO ${VTK_LIBRARY_DIRS}) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_IO}) +FIND_LIBRARY(VTK_RENDERING vtkRendering ${VTK_LIBRARY_DIRS}) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_RENDERING}) +FIND_LIBRARY(VTK_HYBRID vtkHybrid ${VTK_LIBRARY_DIRS}) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_HYBRID}) +FIND_LIBRARY(VTK_PARALLEL vtkParallel ${VTK_LIBRARY_DIRS}) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_PARALLEL}) +FIND_LIBRARY(VTK_WIDGETS vtkWidgets ${VTK_LIBRARY_DIRS}) +SET(VTK_LIBS ${VTK_LIBS} ${VTK_WIDGETS}) diff --git a/adm_local/cmake_files/Makefile.am b/adm_local/cmake_files/Makefile.am new file mode 100644 index 000000000..56abe809b --- /dev/null +++ b/adm_local/cmake_files/Makefile.am @@ -0,0 +1,27 @@ +# Copyright (C) 2005 OPEN CASCADE, CEA, EDF R&D, LEG +# PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT +# 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. +# +# 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 +# +include $(top_srcdir)/adm_local/unix/make_common_starter.am + +dist_admlocal_cmake_DATA = \ +FindCAS.cmake \ +FindOPENGL.cmake \ +FindQT4.cmake \ +FindQWT.cmake \ +FindSIPPYQT.cmake \ +FindVTK.cmake diff --git a/adm_local/unix/make_common_starter.am b/adm_local/unix/make_common_starter.am index df75ae408..34862ee7f 100644 --- a/adm_local/unix/make_common_starter.am +++ b/adm_local/unix/make_common_starter.am @@ -25,6 +25,9 @@ admlocaldir = $(prefix)/adm_local admlocalunixdir = $(admlocaldir)/unix admlocalm4dir = $(admlocaldir)/unix/config_files +# Directory for install cmake files +admlocal_cmakedir = $(admlocaldir)/cmake_files + # Shared modules installation directory sharedpkgpythondir = $(salomepythondir)/shared_modules diff --git a/build_cmake b/build_cmake new file mode 100755 index 000000000..37aad358b --- /dev/null +++ b/build_cmake @@ -0,0 +1,9 @@ +#!/bin/sh + +CURRENT_DIR=`pwd` +CONF_DIR=`echo $0 | sed -e "s,[^/]*$,,;s,/$,,;s,^$,.,"` +cd ${CONF_DIR} +python $KERNEL_ROOT_DIR/salome_adm/cmake_files/am2cmake.py --gui +status=$? +cd ${CURRENT_DIR} +exit $status diff --git a/configure.ac b/configure.ac index e761d9ec4..3fc17f1e7 100644 --- a/configure.ac +++ b/configure.ac @@ -578,6 +578,7 @@ echo AC_OUTPUT([ \ ./salome_adm/unix/SALOMEconfig.h \ ./adm_local/Makefile \ + ./adm_local/cmake_files/Makefile \ ./adm_local/unix/Makefile \ ./adm_local/unix/config_files/Makefile \ ./bin/VERSION \ -- 2.39.2