Date: Wed, 7 Aug 2013 10:38:17 +0000 (UTC) From: Oliver Lehmann <oliver@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324342 - in head/graphics/ogre3d: . files Message-ID: <201308071038.r77AcHbN054770@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: oliver Date: Wed Aug 7 10:38:16 2013 New Revision: 324342 URL: http://svnweb.freebsd.org/changeset/ports/324342 Log: fix clang detection PR: ports/180092 Submitted by: tijl Modified: head/graphics/ogre3d/Makefile head/graphics/ogre3d/files/patch-CMake_ConfigureBuild.cmake (contents, props changed) Modified: head/graphics/ogre3d/Makefile ============================================================================== --- head/graphics/ogre3d/Makefile Wed Aug 7 10:28:44 2013 (r324341) +++ head/graphics/ogre3d/Makefile Wed Aug 7 10:38:16 2013 (r324342) @@ -39,10 +39,6 @@ PLIST_SUB+= BOOSTFALSE="" BROKEN= Does not install on powerpc .endif -.if ${CXX:M*clang*} -CMAKE_ARGS+= -DCMAKE_COMPILER_IS_GNUCXX:BOOL=YES -.endif - post-patch: .if ! ${PORT_OPTIONS:MBOOST} @${REINPLACE_CMD} -e 's|Boost|No_Boost|g' \ Modified: head/graphics/ogre3d/files/patch-CMake_ConfigureBuild.cmake ============================================================================== --- head/graphics/ogre3d/files/patch-CMake_ConfigureBuild.cmake Wed Aug 7 10:28:44 2013 (r324341) +++ head/graphics/ogre3d/files/patch-CMake_ConfigureBuild.cmake Wed Aug 7 10:38:16 2013 (r324342) @@ -1,6 +1,6 @@ ---- CMake/ConfigureBuild.cmake.orig 2011-08-21 00:23:58.000000000 +0200 -+++ CMake/ConfigureBuild.cmake 2011-08-21 00:25:02.000000000 +0200 -@@ -180,18 +180,18 @@ if (UNIX) +--- CMake/ConfigureBuild.cmake.orig 2012-09-02 07:27:14.000000000 +0200 ++++ CMake/ConfigureBuild.cmake 2013-06-15 16:28:56.000000000 +0200 +@@ -189,18 +189,18 @@ if (UNIX) else () configure_file(${OGRE_TEMPLATES_DIR}/OGRE.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE.pc @ONLY) endif () @@ -22,7 +22,7 @@ endif () if (OGRE_BUILD_COMPONENT_TERRAIN) -@@ -199,17 +199,17 @@ if (UNIX) +@@ -208,20 +208,20 @@ if (UNIX) set(OGRE_PAGING_ADDITIONAL_PACKAGES ", OGRE-Paging = ${OGRE_VERSION}") endif () configure_file(${OGRE_TEMPLATES_DIR}/OGRE-Terrain.pc.in ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Terrain.pc @ONLY) @@ -42,4 +42,8 @@ + install(FILES ${OGRE_BINARY_DIR}/pkgconfig/OGRE-Property.pc DESTINATION ${OGRE_LIBDATA_DIRECTORY}/pkgconfig) endif () - endif () +- if (CMAKE_CXX_COMPILER MATCHES ".*clang") ++ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") + set(CMAKE_COMPILER_IS_CLANGXX 1) + endif () +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308071038.r77AcHbN054770>