From: Axel R. <ro...@us...> - 2006-12-14 13:55:23
|
Update of /cvsroot/sdif/Easdif In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv1687 Modified Files: CMakeLists.txt Log Message: Add swig to all target when generator is not unix makefiles. Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/sdif/Easdif/CMakeLists.txt,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** CMakeLists.txt 12 Dec 2006 23:28:25 -0000 1.19 --- CMakeLists.txt 14 Dec 2006 13:55:19 -0000 1.20 *************** *** 233,237 **** OPTION(DOSWIG OFF) IF(DOSWIG) ! ADD_SUBDIRECTORY( swig EXCLUDE_FROM_ALL ) ENDIF(DOSWIG) --- 233,241 ---- OPTION(DOSWIG OFF) IF(DOSWIG) ! IF(CMAKE_GENERATOR MATCHES "^Unix Makefiles") ! ADD_SUBDIRECTORY( swig EXCLUDE_FROM_ALL ) ! ELSE(CMAKE_GENERATOR MATCHES "^Unix Makefiles") ! ADD_SUBDIRECTORY( swig ) ! ENDIF(CMAKE_GENERATOR MATCHES "^Unix Makefiles") ENDIF(DOSWIG) *************** *** 242,246 **** GET_DIRECTORY_PROPERTY(easdifDOCFILES DIRECTORY easdif DEFINITION srcDOCFILES) SET(DOCFILES ${easdifDOCFILES} CACHE INTERNAL "files containing doc sources" FORCE) ! MESSAGE("doc files : ${DOCFILES}") # Documentation generation with Doxygen --- 246,250 ---- GET_DIRECTORY_PROPERTY(easdifDOCFILES DIRECTORY easdif DEFINITION srcDOCFILES) SET(DOCFILES ${easdifDOCFILES} CACHE INTERNAL "files containing doc sources" FORCE) ! #MESSAGE("doc files : ${DOCFILES}") # Documentation generation with Doxygen *************** *** 293,297 **** SET(CPACK_SOURCE_IGNORE_FILES "/CVS/" "/\\\\.svn/" "\\\\.swp$" "\\\\.#" "/#" "~$" "/build.*/" "/autom4te.cache/" "/SDIF/others/" "/all.ircam.sh$" "/all.install$" "/SDIF/sdif/ReadFromMemory.txt$" "/test/fall.sdif" "/Makefile$" "sdif.sln$" "/SDIF/test/prof/" "/SDIF/test/.*src$" "/SDIF/test/.*dsp$" "/SDIF/test/SdifTypes.STYP" "/macosxbuild/[^MS]$" "/macosxbuild/.*plist$" "/macosxbuild/.*MacOSX.binary-distrib$" "/macosxbuild/S.*/[^Mp]" "/macosxbuild/SDIF.xcodeproj/" ".cvsignore$" "/test/ent.*cpp$" "/test/t[tryoe].*cpp$" "/SDIF/doc/pics/.*fig$" "/SDIF/doc/intern/" "/SDIF/doc/standard/" "/SDIF/doc/index-sf.html" "/SDIF/doc/Makefile.doc" "/SDIF/doc/sdif.src" "/SDIF/doc/.*txt" "/SDIF/types/" "/SDIF/tools/main.nib/" "/SDIF/tools/.*sdef" "/SDIF/tools/.*cp$" "/SDIF/tools/.*h$" "/SDIF/tools/sdifusage.*$" "/SDIF/tools/.*vcproj$" "/SDIF/doc/download/" "compileandinstall$" "/sdifcpp/.*cpp" "/sdifcpp/.*h$" "/test/Ne*\\\\.sdif$" "/test/tut[mn].*\\\\.cpp$" "/test/es.*cpp$" "/test/[cmvnrs].*cpp$" ) ! MESSAGE("CPACK_SOURCE_IGNORE_FILES ${CPACK_SOURCE_IGNORE_FILES}") INCLUDE(CPack) --- 297,301 ---- SET(CPACK_SOURCE_IGNORE_FILES "/CVS/" "/\\\\.svn/" "\\\\.swp$" "\\\\.#" "/#" "~$" "/build.*/" "/autom4te.cache/" "/SDIF/others/" "/all.ircam.sh$" "/all.install$" "/SDIF/sdif/ReadFromMemory.txt$" "/test/fall.sdif" "/Makefile$" "sdif.sln$" "/SDIF/test/prof/" "/SDIF/test/.*src$" "/SDIF/test/.*dsp$" "/SDIF/test/SdifTypes.STYP" "/macosxbuild/[^MS]$" "/macosxbuild/.*plist$" "/macosxbuild/.*MacOSX.binary-distrib$" "/macosxbuild/S.*/[^Mp]" "/macosxbuild/SDIF.xcodeproj/" ".cvsignore$" "/test/ent.*cpp$" "/test/t[tryoe].*cpp$" "/SDIF/doc/pics/.*fig$" "/SDIF/doc/intern/" "/SDIF/doc/standard/" "/SDIF/doc/index-sf.html" "/SDIF/doc/Makefile.doc" "/SDIF/doc/sdif.src" "/SDIF/doc/.*txt" "/SDIF/types/" "/SDIF/tools/main.nib/" "/SDIF/tools/.*sdef" "/SDIF/tools/.*cp$" "/SDIF/tools/.*h$" "/SDIF/tools/sdifusage.*$" "/SDIF/tools/.*vcproj$" "/SDIF/doc/download/" "compileandinstall$" "/sdifcpp/.*cpp" "/sdifcpp/.*h$" "/test/Ne*\\\\.sdif$" "/test/tut[mn].*\\\\.cpp$" "/test/es.*cpp$" "/test/[cmvnrs].*cpp$" ) ! #MESSAGE("CPACK_SOURCE_IGNORE_FILES ${CPACK_SOURCE_IGNORE_FILES}") INCLUDE(CPack) |