Revision: 74340 http://trac.macports.org/changeset/74340 Author: michaelld@macports.org Date: 2010-12-13 08:53:13 -0800 (Mon, 13 Dec 2010) Log Message: ----------- kde 1.1 PortGroup: Add common / standard CMake configure defines that are used by multiple ports to avoid conflicts with non-MacPorts-installed Frameworks, headers, and libraries. For ports that do not require a define, it will be added to the CMakeCache.txt file but not used -- so, these do no harm if not needed; if needed, they explicitly define the use of MacPorts-provided libraries and headers. Modified Paths: -------------- trunk/dports/_resources/port1.0/group/kde4-1.1.tcl Modified: trunk/dports/_resources/port1.0/group/kde4-1.1.tcl =================================================================== --- trunk/dports/_resources/port1.0/group/kde4-1.1.tcl 2010-12-13 16:49:49 UTC (rev 74339) +++ trunk/dports/_resources/port1.0/group/kde4-1.1.tcl 2010-12-13 16:53:13 UTC (rev 74340) @@ -105,13 +105,35 @@ unset cmake_module_path } -# standard configure args; virtuall all KDE ports use CMake and Qt4 +# standard configure args; virtuall all KDE ports use CMake and Qt4. configure.args-append -DBUILD_doc=OFF \ -DBUILD_SHARED_LIBS=ON \ -DBUNDLE_INSTALL_DIR=${applications_dir}/KDE4 \ -DKDE_DISTRIBUTION_TEXT="MacPorts\/Mac OS X" \ ${qt_cmake_defines} +# explicitly define certain headers and libraries, to avoid +# conflicts with those installed into system paths by the user. +configure.args-append -DGETTEXT_INCLUDE_DIR=${prefix}/include \ + -DGIF_INCLUDE_DIR=${prefix}/include \ + -DJASPER_INCLUDE_DIR=${prefix}/include \ + -DJASPER_LIBRARY=${prefix}/lib/libjasper.dylib \ + -DJPEG_INCLUDE_DIR=${prefix}/include \ + -DLIBINTL_INCLUDE_DIR=${prefix}/include \ + -DPNG_PNG_INCLUDE_DIR=${prefix}/include \ + -DPNG_LIBRARY=${prefix}/lib/libpng.dylib \ + -DTIFF_INCLUDE_DIR=${prefix}/include \ + -DLIBXSLT_INCLUDE_DIR=${prefix}/include \ + -DLIBXSLT_LIBRARIES=${prefix}/lib/libxslt.dylib \ + -DLIBEXSLT_LIBRARIES=${prefix}/lib/libexslt.dylib \ + -DQCA2_INCLUDE_DIR=${prefix}/include/QtCrypto \ + -DQCA2_LIBRARIES=${prefix}/lib/libqca.2.dylib \ + -DDOCBOOKXSL_DIR=${prefix}/share/xml/ \ + -DMYSQLD_EXECUTABLE=${prefix}/libexec/mysqld \ + -DMYSQL_INCLUDE_DIR=${prefix}/include/mysql5/mysql \ + -DMYSQL_LIB_DIR=${prefix}/lib/mysql5/mysql \ + -DMYSQLCONFIG_EXECUTABLE=${prefix}/bin/mysql_config5 + # standard variant for building documentation variant docs description "Build documentation" { depends_lib-append port:doxygen