2009/1/28 Mike Stump <[email protected]>:
> Author: mrs
> Date: Tue Jan 27 20:43:35 2009
> New Revision: 63168
>
> URL: http://llvm.org/viewvc/llvm-project?rev=63168&view=rev
> Log:
> Add a preliminary version number.
>
> Modified:
> cfe/trunk/Driver/clang.cpp
>
> Modified: cfe/trunk/Driver/clang.cpp
> URL:
> http://llvm.org/viewvc/llvm-project/cfe/trunk/Driver/clang.cpp?rev=63168&r1=63167&r2=63168&view=diff
>
> ==============================================================================
> --- cfe/trunk/Driver/clang.cpp (original)
> +++ cfe/trunk/Driver/clang.cpp Tue Jan 27 20:43:35 2009
> @@ -1620,6 +1620,10 @@
> }
> }
>
> + if (Verbose)
> + fprintf(stderr, "clang version 1.0 based upon " PACKAGE_STRING
> + " hosted on " LLVM_HOSTTRIPLE "\n");
> +
> if (unsigned NumDiagnostics = Diags.getNumDiagnostics())
> fprintf(stderr, "%d diagnostic%s generated.\n", NumDiagnostics,
> (NumDiagnostics == 1 ? "" : "s"));
>
>
> _______________________________________________
> cfe-commits mailing list
> [email protected]
> http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
>
Hi,
This commit braeks cmake build for me. PACKAGE_STRING is not set by
llvm toplevel CMakeList.txt, and later defined by
'include/llvm/Config/config.h.cmake'.
I also changed PACKAGE_VERSION to match with one from 'configure.ac'.
Attached fix (for llvm).
Piotr
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2072c70..3dcc5e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,8 @@ project(LLVM)
cmake_minimum_required(VERSION 2.6.1)
set(PACKAGE_NAME llvm)
-set(PACKAGE_VERSION svn)
+set(PACKAGE_VERSION 2.6svn)
+set(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")
set(PACKAGE_BUGREPORT "[email protected]")
if( CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR AND NOT MSVC_IDE )
diff --git a/include/llvm/Config/config.h.cmake b/include/llvm/Config/config.h.cmake
index d5e286b..12846fe 100644
--- a/include/llvm/Config/config.h.cmake
+++ b/include/llvm/Config/config.h.cmake
@@ -507,7 +507,7 @@
#cmakedefine PACKAGE_NAME "${PACKAGE_NAME}"
/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
+#cmakedefine PACKAGE_STRING "${PACKAGE_STRING}"
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
