[Cmake-commits] CMake branch, master, updated. v2.8.5-289-g51beb44

2011-08-29 Thread KWSys Robot 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
   via  51beb446c23e73c1c62ba68923218908494a3587 (commit)
  from  b17a6dd55b94179fb87f27255f918a7d82ea57e5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=51beb446c23e73c1c62ba68923218908494a3587
commit 51beb446c23e73c1c62ba68923218908494a3587
Author: KWSys Robot 
AuthorDate: Tue Aug 30 00:01:03 2011 -0400
Commit: KWSys Robot 
CommitDate: Tue Aug 30 00:14:06 2011 -0400

KWSys Nightly Date Stamp

diff --git a/Source/kwsys/kwsysDateStamp.cmake 
b/Source/kwsys/kwsysDateStamp.cmake
index 879e3f5..71c231f 100644
--- a/Source/kwsys/kwsysDateStamp.cmake
+++ b/Source/kwsys/kwsysDateStamp.cmake
@@ -18,4 +18,4 @@ SET(KWSYS_DATE_STAMP_YEAR  2011)
 SET(KWSYS_DATE_STAMP_MONTH 08)
 
 # KWSys version date day component.  Format is DD.
-SET(KWSYS_DATE_STAMP_DAY   29)
+SET(KWSYS_DATE_STAMP_DAY   30)

---

Summary of changes:
 Source/kwsys/kwsysDateStamp.cmake |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v2.8.5-1753-g41bd091

2011-08-29 Thread Clinton Stimpson 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  41bd091d50250de974d9fbe8f30bddc00618973c (commit)
   via  a67be31784ca6e2683fb5b86988bc5c81680c07c (commit)
  from  de0bd3ff7a4097961fe1b529f2723d6009ac403b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41bd091d50250de974d9fbe8f30bddc00618973c
commit 41bd091d50250de974d9fbe8f30bddc00618973c
Merge: de0bd3f a67be31
Author: Clinton Stimpson 
AuthorDate: Mon Aug 29 10:24:34 2011 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 29 10:24:34 2011 -0400

Merge topic 'qt4-find-uitools-mingw-cross' into next

a67be31 qt4: also find QtUiTools when cross compiling with mingw.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a67be31784ca6e2683fb5b86988bc5c81680c07c
commit a67be31784ca6e2683fb5b86988bc5c81680c07c
Author: Clinton Stimpson 
AuthorDate: Mon Aug 29 08:23:44 2011 -0600
Commit: Clinton Stimpson 
CommitDate: Mon Aug 29 08:23:44 2011 -0600

qt4: also find QtUiTools when cross compiling with mingw.

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 1ebd69d..3b05c2b 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -862,10 +862,11 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
 )
   ENDFOREACH(QT_MODULE)
 
-  # QtUiTools not with other frameworks with binary installation (in /usr/lib)
-  IF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT 
QT_QTUITOOLS_LIBRARY_RELEASE)
+  # QtUiTools is sometimes not in the same directory as the other found 
libraries
+  # e.g. on Mac, its never a framework like the others are
+  IF(QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE)
 FIND_LIBRARY(QT_QTUITOOLS_LIBRARY_RELEASE NAMES QtUiTools${QT_LIBINFIX} 
PATHS ${QT_LIBRARY_DIR})
-  ENDIF(Q_WS_MAC AND QT_QTCORE_LIBRARY_RELEASE AND NOT 
QT_QTUITOOLS_LIBRARY_RELEASE)
+  ENDIF(QT_QTCORE_LIBRARY_RELEASE AND NOT QT_QTUITOOLS_LIBRARY_RELEASE)
 
   # Set QT_QTDESIGNERCOMPONENTS_LIBRARY
   FIND_LIBRARY(QT_QTDESIGNERCOMPONENTS_LIBRARY_RELEASE NAMES 
QtDesignerComponents${QT_LIBINFIX} QtDesignerComponents${QT_LIBINFIX}4 PATHS 
${QT_LIBRARY_DIR} NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)

---

Summary of changes:
 Modules/FindQt4.cmake |7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v2.8.5-1751-gde0bd3f

2011-08-29 Thread Todd Gamblin 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  de0bd3ff7a4097961fe1b529f2723d6009ac403b (commit)
   via  5993891e8d3092375f4409e8d07f5138a1cb55be (commit)
  from  d7d3a5b134e890055a3cf79cb27df612eda6704f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de0bd3ff7a4097961fe1b529f2723d6009ac403b
commit de0bd3ff7a4097961fe1b529f2723d6009ac403b
Merge: d7d3a5b 5993891
Author: Todd Gamblin 
AuthorDate: Mon Aug 29 10:01:52 2011 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 29 10:01:52 2011 -0400

Merge topic 'bg-link-fixes' into next

5993891 Fixed link bugs in BlueGeneP build.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5993891e8d3092375f4409e8d07f5138a1cb55be
commit 5993891e8d3092375f4409e8d07f5138a1cb55be
Author: Todd Gamblin 
AuthorDate: Sun Aug 28 21:54:45 2011 -0700
Commit: Todd Gamblin 
CommitDate: Sun Aug 28 22:08:11 2011 -0700

Fixed link bugs in BlueGeneP build.

- Build wasn't properly using -soname linker args, so installed libraries
  could depend on relative paths from the build directory.
- Consolidated GNU linker args to one place in the BlueGeneP-base platform
  file, since ld is used by both XL and GNU toolchains on BlueGene.

diff --git a/Modules/Platform/BlueGeneP-base.cmake 
b/Modules/Platform/BlueGeneP-base.cmake
index 2ca920f..926dbc0 100644
--- a/Modules/Platform/BlueGeneP-base.cmake
+++ b/Modules/Platform/BlueGeneP-base.cmake
@@ -85,20 +85,23 @@ set(CMAKE_DL_LIBS "dl")
 macro(__BlueGeneP_set_dynamic_flags compiler_id lang)
   if (${compiler_id} STREQUAL XL)
 # Flags for XL compilers if we explicitly detected XL
-set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-qpic")
# -pic
-set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-qmkshrobj -qnostaticlink") 
# -shared
-set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,-rpath,")   
# -rpath
-set(BGP_${lang}_DYNAMIC_EXE_FLAGS "-qnostaticlink -qnostaticlink=libgcc")
+set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS   "-qpic")
+set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS"-qmkshrobj 
-qnostaticlink")
+set(BGP_${lang}_DYNAMIC_EXE_FLAGS"-qnostaticlink 
-qnostaticlink=libgcc")
   else()
 # Assume flags for GNU compilers (if the ID is GNU *or* anything else).
-set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS "-fPIC")   # -pic
-set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS "-shared")  # -shared
-set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG "-Wl,-rpath,")  # -rpath
-set(BGP_${lang}_DYNAMIC_EXE_FLAGS "-dynamic")
+set(CMAKE_SHARED_LIBRARY_${lang}_FLAGS   "-fPIC")
+set(CMAKE_SHARED_LIBRARY_CREATE_${lang}_FLAGS"-shared")
+set(BGP_${lang}_DYNAMIC_EXE_FLAGS"-dynamic")
   endif()
 
-  set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS"") # +s, flag for exe 
link to use shared lib
-  set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP ":") # : or empty
+  # Both toolchains use the GNU linker on BG/P, so these options are shared.
+  set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG  "-Wl,-rpath,")
+  set(CMAKE_SHARED_LIBRARY_RPATH_LINK_${lang}_FLAG   "-Wl,-rpath-link,")
+  set(CMAKE_SHARED_LIBRARY_SONAME_${lang}_FLAG   "-Wl,-soname,")
+  set(CMAKE_EXE_EXPORTS_${lang}_FLAG "-Wl,--export-dynamic")
+  set(CMAKE_SHARED_LIBRARY_LINK_${lang}_FLAGS"")  # +s, flag for exe 
link to use shared lib
+  set(CMAKE_SHARED_LIBRARY_RUNTIME_${lang}_FLAG_SEP  ":") # : or empty
 
   set(BGP_${lang}_DEFAULT_EXE_FLAGS
 " -o  
")

---

Summary of changes:
 Modules/Platform/BlueGeneP-base.cmake |   23 +--
 1 files changed, 13 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits

[Cmake-commits] CMake branch, next, updated. v2.8.5-1749-gd7d3a5b

2011-08-29 Thread Todd Gamblin 
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
   via  d7d3a5b134e890055a3cf79cb27df612eda6704f (commit)
   via  d1697625f8dd279ae5ebd8df887908f28c2f9f40 (commit)
   via  b17a6dd55b94179fb87f27255f918a7d82ea57e5 (commit)
   via  195ac0aac1a8e3e02f9951a4a3c0ea2d37a3f68a (commit)
  from  f6218b1f7f85bb3ad111ecf5c8ac831e54f19853 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d7d3a5b134e890055a3cf79cb27df612eda6704f
commit d7d3a5b134e890055a3cf79cb27df612eda6704f
Merge: f6218b1 d169762
Author: Todd Gamblin 
AuthorDate: Mon Aug 29 10:01:20 2011 -0400
Commit: CMake Topic Stage 
CommitDate: Mon Aug 29 10:01:20 2011 -0400

Merge topic 'xl-CreateExportList-fix' into next

d169762 Fix XL compilers on non-AIX machines.
b17a6dd KWSys Nightly Date Stamp
195ac0a KWSys Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d1697625f8dd279ae5ebd8df887908f28c2f9f40
commit d1697625f8dd279ae5ebd8df887908f28c2f9f40
Author: Todd Gamblin 
AuthorDate: Sun Aug 28 21:58:35 2011 -0700
Commit: Todd Gamblin 
CommitDate: Sun Aug 28 22:04:41 2011 -0700

Fix XL compilers on non-AIX machines.

Linking broken on non-AIX machines when using XL compilers due to those
machines not using the CreateExportList tool.  Made use of this tool
conditional on finding it.

diff --git a/Modules/Compiler/XL.cmake b/Modules/Compiler/XL.cmake
index d07890f..d2567d5 100644
--- a/Modules/Compiler/XL.cmake
+++ b/Modules/Compiler/XL.cmake
@@ -35,14 +35,19 @@ macro(__compiler_xl lang)
   set(CMAKE_${lang}_CREATE_PREPROCESSED_SOURCE " 
  -E  > ")
   set(CMAKE_${lang}_CREATE_ASSEMBLY_SOURCE " 
  -S  -o ")
 
-  # The compiler front-end passes all object files, archive files, and shared
-  # library files named on the command line to CreateExportList to create a
-  # list of all symbols to be exported from the shared library.  This causes
-  # all archive members to be copied into the shared library whether they are
-  # needed or not.  Instead we run the tool ourselves to pass only the object
-  # files so that we export only the symbols actually provided by the sources.
-  set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
-"${CMAKE_XL_CreateExportList} /objects.exp "
-"  
  
 -Wl,-bE:/objects.exp 
 -o   
"
-)
+  # CMAKE_XL_CreateExportList is part of the AIX XL compilers but not the 
linux ones.
+  # If we found the tool, we'll use it to create exports, otherwise stick with 
the regular
+  # create shared library compile line.
+  if (CMAKE_XL_CreateExportList)
+# The compiler front-end passes all object files, archive files, and shared
+# library files named on the command line to CreateExportList to create a
+# list of all symbols to be exported from the shared library.  This causes
+# all archive members to be copied into the shared library whether they are
+# needed or not.  Instead we run the tool ourselves to pass only the object
+# files so that we export only the symbols actually provided by the 
sources.
+set(CMAKE_${lang}_CREATE_SHARED_LIBRARY
+  "${CMAKE_XL_CreateExportList} /objects.exp "
+  "  
  
 -Wl,-bE:/objects.exp 
 -o   
"
+  )
+  endif()
 endmacro()

---

Summary of changes:
 Modules/Compiler/XL.cmake |   25 +++--
 Source/kwsys/kwsysDateStamp.cmake |2 +-
 2 files changed, 16 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits