Re: [cmake-developers] Adding MacroWriteBasicCMakeVersionFile.cmake file to cmake ?

2011-08-04 Thread Brad King

On 8/3/2011 4:04 PM, Brad King wrote:

On 8/3/2011 4:00 PM, Alexander Neundorf wrote:

Are you ok with this branch or are there issues left (...since it wasn't
merged into master on Tuesday) ?


I still need to find time to do further review and try it out.


Okay, here are a few comments from a quick review.

(1) The pointer size sanity check should report failure with
PACKAGE_VERSION_UNSUITABLE as documented here:

  http://www.cmake.org/cmake/help/cmake-2-8-docs.html#command:find_package
  http://www.cmake.org/Wiki/CMake/Tutorials/Packaging#Package_Version_Files

The version might be compatible but the package is unsuitable anyway.
With this approach you don't need to have the whole version check
inside an else() block so the code should look simpler.

(2) The documentation of the module has a few typos.  Please
proofread it again.  Also, please use the word compatible rather
than suitable to refer version acceptability.  This makes the
distinction noted above in (1).

(3) After noting the implementation detail with configure_file the
documentation should state that users should never directly configure
the files themselves.

(4) I wonder if we should just make AnyNewerVersion the default for
COMPATIBILITY so it does not have to be specified at all in the most
obvious and (probably) common case.  Comments?

Thanks,
-Brad
___
cmake-developers mailing list
cmake-developers@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers


Re: [CMake] Easing the pain with Visual Studio 2010 and CMake

2011-08-04 Thread Micha Renner
Am Donnerstag, den 04.08.2011, 10:05 +0200 schrieb Thomas Sondergaard:
 It is a bit of a pain to work with Visual Studio 2010 and CMake due to 
 this bug: http://gccxml.org/Bug/view.php?id=11258 (VS 2010 CMake plugin 
 is broken). It doesn't look like much progress is being made with fixing 
 this bug, so I'm looking for workarounds.
 
 To this point, whenever I've changed anything that I know will cause 
 CMake to rerun I will close the solution, run cmake by hand in a shell 
 and then open the solution again.  

That's the way to do it. Currently, there is no other solution, but I
always thought that this problem is limited to the Express Version of VS
(no makros).

Greetings

Micha




___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


[CMake] Cannot include GL/glew.h in XCode 4.1

2011-08-04 Thread Marco Fiocco
Hi,
I have a project that compiles everywhere (Linux, Windows (Visual Studio
2008), MacOS 10.7 with makefiles) apart Xcode 4.1.
It does not like
#include GL/glew.h

I'm sure all the paths are included with CMake (otherwise it could not
compile on other platforms). It is located in /usr/include, but even if I
write this path manually in the Xcode settings it just ignores it.
Only if I write
#include /usr/include/GL/glew.h

it can compile.

Is it a bug of CMake? Xcode 4.1?
I repeat that the simple makefile generator works.

Thx
Marco
___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake

[CMake] Intertwined projects.

2011-08-04 Thread Mathias Sulser
Hello.

This is my first post on this ML - so hi to everyone.
I have been playing around with CMake for a while now and would love
to introduce it to our projects. However, I wasn't able to answer the
question below myself. Help appreciated.

Short version:
How do you layout internal project dependencies in CMake from multiple
repositories? Is ExternalProject, a super build or something else the
way to go?

Long version:
I have the following project/repo layout:

app1.git
  /src
  /include
  /test
  CMakeLists.txt

app2.git
  ..

libA.git
  ..

libB.git
  ..


I was thinking of using ExternalProject_Add in app1's CMakeLIsts.txt
to declare it's dependencies on libA and libB. This works fine, it
even allows pointing to a local git repo and branch on the dev boxes.

Now, if I bring a central CI server (i.e. jenkins) into play, the
INSTALL command required for ExternalProject screws things up for me.
I can't have app1 depending on v1 of libA and app2 on v2 of libA as
both get installed in the same location.

Any ideas how to solve this? Am I misusing ExternalProject's
functionality for internal dependencies?

Cheers,
Mathias
___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


[CMake] [Cmake/SWIG/JAVA/WINDOWS] add -Wl,--kill-at flag

2011-08-04 Thread Benjamin Ruard
Hi everybody,
I use CMake to wrap a c++ library in Java with swig. When I use linux OS
it works very well, but when I use windows OS there is a problem.
Indeed, the compilation works fine but the dll has not the correct
method/fonction inside. After several researches on the web I find I
must use the flag -Wl,--kill-at when I create the dll. But I do not
find the equivalent flag on cmake, I try:

CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS
CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS
CMAKE_SHARED_LIBRARY_CXX_FLAGS
CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS
CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG
CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG_SEP
CMAKE_SHARED_LIBRARY_LINK_STATIC_CXX_FLAGS
CMAKE_SHARED_LIBRARY_LINK_DYNAMIC_CXX_FLAGS

Does somebody know a solution?

Thanks

Benjamin JEANTY-RUARD

___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


[CMake] touch flag once all (target) sucess

2011-08-04 Thread t m
Hi All,

I would like to touch flag file in the CMAKE_BINARY_DIR once the
target all is executed with sucess.
Since currently I'm not able to specify the dependency to this
build-in target I do not have any hook to recognize if all sucess and
to touch file.

1. Does anyone knows any hint that can help me with this issue
2. Question to CMake developers/maintainers: Is there any plan  to
implement this ticket in near future:
http://www.cmake.org/Bug/view.php?id=8438#c26520

regards, T Majchrowski.
___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


Re: [CMake] [Cmake/SWIG/JAVA/WINDOWS] add -Wl,--kill-at flag

2011-08-04 Thread David Cole
Are you sure you don't just need an:

extern C {
}

block around a function implemented in a C++ file...?


On Thu, Aug 4, 2011 at 7:30 AM, Benjamin Ruard ru...@artenum.com wrote:
 Hi everybody,
 I use CMake to wrap a c++ library in Java with swig. When I use linux OS
 it works very well, but when I use windows OS there is a problem.
 Indeed, the compilation works fine but the dll has not the correct
 method/fonction inside. After several researches on the web I find I
 must use the flag -Wl,--kill-at when I create the dll. But I do not
 find the equivalent flag on cmake, I try:

 CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS
 CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS
 CMAKE_SHARED_LIBRARY_CXX_FLAGS
 CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS
 CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG
 CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG_SEP
 CMAKE_SHARED_LIBRARY_LINK_STATIC_CXX_FLAGS
 CMAKE_SHARED_LIBRARY_LINK_DYNAMIC_CXX_FLAGS

 Does somebody know a solution?

 Thanks

 Benjamin JEANTY-RUARD

 ___
 Powered by www.kitware.com

 Visit other Kitware open-source projects at 
 http://www.kitware.com/opensource/opensource.html

 Please keep messages on-topic and check the CMake FAQ at: 
 http://www.cmake.org/Wiki/CMake_FAQ

 Follow this link to subscribe/unsubscribe:
 http://www.cmake.org/mailman/listinfo/cmake

___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


Re: [CMake] [Cmake/SWIG/JAVA/WINDOWS] add -Wl,--kill-at flag

2011-08-04 Thread Benjamin Ruard
Thanks for your answer, but

The block:
extern C {
...
}

already exists.

Regards.

Benjamin JEANTY-RUARD

Le jeudi 04 août 2011 à 08:40 -0400, David Cole a écrit :
 Are you sure you don't just need an:
 
 extern C {
 }
 
 block around a function implemented in a C++ file...?
 
 
 On Thu, Aug 4, 2011 at 7:30 AM, Benjamin Ruard ru...@artenum.com wrote:
  Hi everybody,
  I use CMake to wrap a c++ library in Java with swig. When I use linux OS
  it works very well, but when I use windows OS there is a problem.
  Indeed, the compilation works fine but the dll has not the correct
  method/fonction inside. After several researches on the web I find I
  must use the flag -Wl,--kill-at when I create the dll. But I do not
  find the equivalent flag on cmake, I try:
 
  CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS
  CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS
  CMAKE_SHARED_LIBRARY_CXX_FLAGS
  CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS
  CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG
  CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG_SEP
  CMAKE_SHARED_LIBRARY_LINK_STATIC_CXX_FLAGS
  CMAKE_SHARED_LIBRARY_LINK_DYNAMIC_CXX_FLAGS
 
  Does somebody know a solution?
 
  Thanks
 
  Benjamin JEANTY-RUARD
 
  ___
  Powered by www.kitware.com
 
  Visit other Kitware open-source projects at 
  http://www.kitware.com/opensource/opensource.html
 
  Please keep messages on-topic and check the CMake FAQ at: 
  http://www.cmake.org/Wiki/CMake_FAQ
 
  Follow this link to subscribe/unsubscribe:
  http://www.cmake.org/mailman/listinfo/cmake
 


___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake

Re: [CMake] How to create a 64-bit Windows build of cmake? Added for building vtk-5.0.0

2011-08-04 Thread John R. Cary

To close out this thread, I think I can now explain what was
happening.

I was indeed getting a win64-release version of cmake, by
configuring in a Visual Studio Win64 command window with

cmake \
  -G 'NMake Makefiles'
  -DCMAKE_INSTALL_PREFIX:PATH=C:/winsame/contrib-vs9/cmake-2.8.5-ser \
  -DCMAKE_BUILD_TYPE:STRING=RELEASE \
  -DCMAKE_C_COMPILER:FILEPATH='cl' \
  -DCMAKE_CXX_COMPILER:FILEPATH='cl'
path to source

then doing nmake; nmake package and using that package
to install cmake.  This only problem was that the default
location came out as /Program Files/... instead of /Program
Files (x86)/..., but this was modified at installation time.

But then in configuring VTK, CMake was constructing the
libraries, such as cmVTK_WRAP_TCL2.dll, as Debug.  The problem
was that the flag, -DCMAKE_BUILD_TYPE:STRING=RELEASE,
was not getting used by the TRY_COMPILE in
CMake/vtkCompileCMakeExtensions.cmake to configure
CMake/CMakeLists.txt.

CMake/vtkCompileCMakeExtensions.cmake, which is used by the
configuration of CMake/CMakeLists.txt.  So now I send this
explicitly as shown in the patch below.  All now configures
and builds.

So should CMake pass the flag, CMAKE_BUILD_TYPE, automatically
to try_compile?  Or should the module do that?  (It would seem
that CMake would have to send its build type to the module if
it were to load it, but it would have to respect the build type
if a built application were to load it.)  Because I my
uncertainty, do not know whether to report this as a bug.

Thx..John Cary

cat vtk-5.0.0i.patch
diff -ruN vtk-5.0.0i/CMake/vtkCompileCMakeExtensions.cmake 
vtk-5.0.0i-new/CMake/vtkCompileCMakeExtensions.cmake
--- vtk-5.0.0i/CMake/vtkCompileCMakeExtensions.cmake2011-03-25 
18:03:24.0 -0600
+++ vtk-5.0.0i-new/CMake/vtkCompileCMakeExtensions.cmake
2011-08-04 07:18:16.0 -0600

@@ -19,9 +19,13 @@
 IF(COMMAND VTK_WRAP_TCL2)
 ELSE(COMMAND VTK_WRAP_TCL2)
   MESSAGE(STATUS Compiling VTK CMake commands)
+  set(TRY_COMPILE_OTHER_FLAGS)
+  if (CMAKE_BUILD_TYPE)
+set(TRY_COMPILE_OTHER_FLAGS ${TRY_COMPILE_OTHER_FLAGS} 
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE})

+  endif ()
   TRY_COMPILE(${result_var} ${build_dir} ${source_dir}
 VTK_LOADED_COMMANDS
-CMAKE_FLAGS -DVTK_BUILD_FROM_TRY_COMPILE:BOOL=TRUE
+CMAKE_FLAGS -DVTK_BUILD_FROM_TRY_COMPILE:BOOL=TRUE 
${TRY_COMPILE_OTHER_FLAGS}

 OUTPUT_VARIABLE VTK_COMPILE_CMAKE_EXTENSIONS_OUTPUT)
   IF(${result_var})
 MESSAGE(STATUS Compiling VTK CMake commands - done)
diff -ruN vtk-5.0.0i/Common/vtkPythonUtil.cxx 
vtk-5.0.0i-new/Common/vtkPythonUtil.cxx

--- vtk-5.0.0i/Common/vtkPythonUtil.cxx 2011-03-25 18:03:25.0 -0600
+++ vtk-5.0.0i-new/Common/vtkPythonUtil.cxx 2011-08-04 
07:13:41.0 -0600

@@ -27,6 +27,7 @@

 #include vtkstd/map
 #include vtkstd/string
+#include cstddef

 #if defined ( _MSC_VER )
 #  define vtkConvertPtrToLong(x) ((long)(PtrToUlong(x)))



 Date: Tue, 2 Aug 2011 09:42:07 -0400
 From: David Cole david.c...@kitware.com
 Subject: Re: [CMake] How to create a 64-bit Windows build of cmake?
 To: John R. Cary c...@txcorp.com
 Cc: cmake Mailing List cmake@cmake.org
 Message-ID:
 caadwe9wsd7btgpv7s6pzba0feysumq1hrv-ua1xthj9sdpo...@mail.gmail.com
 Content-Type: text/plain; charset=ISO-8859-1

 Try commenting out the one line that causes problems, then back up
 from there, either commenting chunks out or adjusting CMake options
 until those commands are not loaded.


 On Tue, Aug 2, 2011 at 8:50 AM, John R. Cary c...@txcorp.com wrote:
 Thanks for your response. ?This will definitely decrease my headpain.

 It turns out that I need vtk-5.0.0, but right now I am not sure
 that I need the wrapping code. ?Am checking on this.

 Would it make sense to just not call vtkLoadCMakeExtensions.cmake?

 ThxJohn Cary

 On 8/2/11 5:00 AM, David Cole wrote:

 On Tue, Aug 2, 2011 at 7:00 AM, David Coledavid.c...@kitware.com 
?wrote:


 On Mon, Aug 1, 2011 at 8:34 PM, John R. Caryc...@txcorp.com ?wrote:

 I believe I have followed what I have found on the web for
 building a Win64 version of CMake. ?I have downloaded the
 win32 version and used it to configure the cmake source.
 I used the Visual Studio 9 2008 Win64 generator.

 However, when I then use that cmake to configure vtk (an
 old version, 5.0.0) I get the much discussed error,

 -- Loading VTK CMake commands
 CMake Error at CMake/vtkLoadCMakeExtensions.cmake:7 (LOAD_COMMAND):
 ?load_command Attempt to load the library

 
?C:/winsame/cary/builds-vs9/composerall/vtk-5.0.0i/ser/CMake/cmVTK_WRAP_TCL2.dll

 ?failed. ?Additional error info is:

 ?The application has failed to start because its side-by-side
 configuration
 ?is incorrect. ?Please see the application event log or use the
 command-line
 ?sxstrace.exe tool for more detail.

 Call Stack (most recent call first):
 ?CMake/vtkLoadCMakeExtensions.cmake:27 
(VTK_LOAD_SINGLE_CMAKE_EXTENSION)

 ?CMakeLists.txt:632 

[CMake] include directories,

2011-08-04 Thread Łukasz Tasz
Hi All,

I have a question according include_directories() function and
INCLUDE_DIRECTORIES directory property.

Is it possible that I will know set of include directories that will
be used by preprocessor when I'm calling add_executable function?

I notticed, that order does not matter, for example:

add_library(test test.cxx)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}libtest)
add_library(test1 test1.cxx)

both targets will have the same include directories.

so from CMake phase I'm not able to check what will be includes
configuration, INCLUDE_DIRECTORIES property contain only current one.

is this expected behaviour or this can be tuned by setting some policy?

thanks in advance
Lukasz Tasz



-- 
Lukasz Tasz
___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


Re: [CMake] Include directories for C compile command

2011-08-04 Thread Glenn Coombs
CMake deliberately works in a top-down manner for most things.  So variable
values and preprocessor definitions are inherited in subdirectories from the
values they had in the parent.  And any subsequent changes made to them in
the subdirectory scope are not propogated up to the parent.  This is a good
thing in my opinion because it allows you to isolate components from one
another.

If you try to work against this you will find it difficult as CMake doesn't
work that way.

On 4 August 2011 06:15, Andrei Buzgan andrei.buz...@gmail.com wrote:

 Hello Glenn and thanks,

 I found out yesterday the method you describe works. I was trying to use
 include_directories() before, but unfortunately the statement was after any
 add_directory() statement and it was a matter of scope (what other
 variable/property updates add_directory() does?).
 It works now, but still I'm wondering if there is a method of doing the
 same thing at module level (leaf CMakeLists.txt files) and propagate the
 updates upwards in directory hierarchy.

 Thanks again,

 Andrei




 On Wed, Aug 3, 2011 at 8:10 PM, Glenn Coombs glenn.coo...@gmail.comwrote:

 Have you tried using the include_directories() command ?  In your top
 level CMakeLists.txt add a line like this:

 include_directories(SWC1 SWC2 SWC3 Common)

 before you do any add_subdirectory() commands.

 Does that not add the appropriate -Ixxx flags to the compile command ?  It
 does for me but I'm using Visual Studio and gcc rather than an embedded
 compiler.

 On 3 August 2011 07:25, Andrei Buzgan andrei.buz...@gmail.com wrote:

 Hello everyone,

 I'm trying to set up an environment for building a pre-existing medium
 sized embedded software project, by using CMake 2.8 and MinGW. The compiler
 kit is specific for the target microcontroller and contains C compiler,
 assembler, linker, all different executables.

 I do have some restrictions:
 The project structure looks like this:
 Sources
 |-- SWC1
 ||-- swc1.c
 ||-- swc1.h
 ||--CMakeLists.txt
 |-- SWC2
 ||-- swc2_a.c
 ||-- swc2_b.c
 ||-- swc2.h
 ||--CMakeLists.txt
 |-- COMMON
 ||-- config1.h
 ||-- config2.h
 ||--CMakeLists.txt
 |-- UNUSED_DIR
 |-- SWC3
 ||-- swc3.obj
 ||-- swc3.h


 - I cannot change the directory structure of the project (i can add but i
 must not move files around)

 - each SW module (component) has it own files including interface headers
 in it's own directory
 (SW component SWC1 resides in folder SWC1 and contains a source file and
 a header file)

 - SW modules may be interfaced with any other module
 (swc1.c may include swc2.h...)

 - There are common header files with project scope definitions and
 configurations which reside in their own directory too
 (both swc1.c and swc2.c may include headers config1.h and config2.h)

 - The SW has more variants, some variants use different C source files
 for a specific SW component but the sources reside in the same directory and
 interface headers are common for all variants.
 (For SW variant A the SW component SWC2 uses swc2_a.c source file, for SW
 variant B it uses swc2_b.c file)

 - Some SW components are precompiled and provided as object files
 together with the interface header (SWC3)

 *These being the conditions, i couldn't manage to gather the relevant
 folders in order to correctly create the build object command *where
 flags like -Idir_pah1 -Idir_path2 ... are expected in order to look
 for included headers. Due to mixed source-precompiled objects I chose to
 define each component as a static library (add_library(...)) in each
 CMakeLists.txt file and list there the used source files, being able to use
 conditions for SW variants and basically add different library definitions
 for each variant. I intend to add the pre-compiled sources as IMPORTED
 libraries and in the end just link the libraries with the specific linker
 command for linking any object files (but i didn't get there yet!)

 I'm currently use the default  CMAKE_C_COMPILE_OBJECT command
 CMAKE_C_COMPILER DEFINES FLAGS -o OBJECT   -c SOURCE, the compiler
 ignoring the unknown flags (-c in this case). *Without any explicit
 configuration from my part, it looks like FLAGS variable contains also a
 -Ipath directive for the current compiled source file* (path is the
 same directory where the source files about to be compiled resides).

 I tried to use set( CMAKE_INCLUDE_CURRENT_DIR ON ) in each
 CMakeLists.txt file but FLAGS variable seems not to be updated this way.

 I'd like to know if there is an efficient method to build an include
 directory list in order to pass it to compile flags. It would be very useful
 to make this in CMakeLists.txt file or link it somehow to add_directory(dir)
 and use an internal CMake mechanism trying to avoid creating this part of
 the compiler flags manually in order to be easily maintained in the future.

 Thanks,
 Andrei




 ___
 Powered by www.kitware.com

 Visit 

Re: [CMake] Easing the pain with Visual Studio 2010 and CMake

2011-08-04 Thread Glenn Coombs
We do much the same but use a batch file called
startDevStudio.vs2010.cmake.bat like this in the top level:

@echo off

if not exist build\cmake mkdir build\cmake
cd build\cmake
cmake -G Visual Studio 10 ..\..\
IF ERRORLEVEL 1 (
echo.
echo CMake configure failed
echo.
pause
exit 1
)
start title your_project_name.sln

Using a batch file makes it mostly painless to quit and relaunch Visual
Studio.

On 4 August 2011 09:05, Thomas Sondergaard t...@medical-insight.com wrote:

 It is a bit of a pain to work with Visual Studio 2010 and CMake due to this
 bug: 
 http://gccxml.org/Bug/view.**php?id=11258http://gccxml.org/Bug/view.php?id=11258(VS
  2010 CMake plugin is broken). It doesn't look like much progress is
 being made with fixing this bug, so I'm looking for workarounds.

 To this point, whenever I've changed anything that I know will cause CMake
 to rerun I will close the solution, run cmake by hand in a shell and then
 open the solution again. If someone have developed a better workaround for
 this I invite them to post it to this thread.

 Thanks,

 Thomas

 __**_
 Powered by www.kitware.com

 Visit other Kitware open-source projects at http://www.kitware.com/**
 opensource/opensource.htmlhttp://www.kitware.com/opensource/opensource.html

 Please keep messages on-topic and check the CMake FAQ at:
 http://www.cmake.org/Wiki/**CMake_FAQhttp://www.cmake.org/Wiki/CMake_FAQ

 Follow this link to subscribe/unsubscribe:
 http://www.cmake.org/mailman/**listinfo/cmakehttp://www.cmake.org/mailman/listinfo/cmake

___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake

[CMake] Wiki: enabling Cite extension?

2011-08-04 Thread Johannes Zarl
Hi,

Working on the version compatibility matrix (which is now up-to-date once 
again), I came to think that the Cite extension for MediaWiki 
(http://www.mediawiki.org/wiki/Extension:Cite) would allow the compatibility 
matrix to be much more compact (by moving additional notes from the matrix 
into footnotes). 

Would it be possible to install this extension inside the cmake wiki?

Cheers,
  Johannes
___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


Re: [CMake] Wiki: enabling Cite extension?

2011-08-04 Thread David Cole
I've asked our wiki admins if they'll do this... I'll let you know
what they say.

Thanks,
David C.


On Thu, Aug 4, 2011 at 2:47 PM, Johannes Zarl johannes.z...@jku.at wrote:
 Hi,

 Working on the version compatibility matrix (which is now up-to-date once
 again), I came to think that the Cite extension for MediaWiki
 (http://www.mediawiki.org/wiki/Extension:Cite) would allow the compatibility
 matrix to be much more compact (by moving additional notes from the matrix
 into footnotes).

 Would it be possible to install this extension inside the cmake wiki?

 Cheers,
  Johannes
 ___
 Powered by www.kitware.com

 Visit other Kitware open-source projects at 
 http://www.kitware.com/opensource/opensource.html

 Please keep messages on-topic and check the CMake FAQ at: 
 http://www.cmake.org/Wiki/CMake_FAQ

 Follow this link to subscribe/unsubscribe:
 http://www.cmake.org/mailman/listinfo/cmake

___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


Re: [CMake] Bug in cmake 2.8.4/5 when using IMPORTED static targets?

2011-08-04 Thread Brad King

On 7/21/2011 1:07 PM, Marco Corvo wrote:

Hi all,

I'm trying to use a new feature of releases 2.8.4/5, that is the possibility

 to define dependencies for IMPORTED targets and when I run cmake I get a
 SIGSEV signal. Trying to get some more info with Valgrind I found that:

I can reproduce this with just:

  cmake_minimum_required(VERSION 2.8.4)
  project(FOO C)
  add_library(foo STATIC IMPORTED)
  add_dependencies(foo does_not_exist) # ***
  add_executable(bar bar.c)
  target_link_libraries(bar foo)


So it looks like cmake is trying to access (dereference) a NULL pointer.

 In particular, digging in the source code, the issue arises (apparently)
 in cmComputeTargetDepends.cxx(AddTargetDepend) at line 279


cmTarget* transitive_dependee =
dependee-GetMakefile()-FindTargetToUse(i-c_str());

when cmake recursively calculates the dependency of my target, which relies

 on all IMPORTED targets, and hits an IMPORTED target (a library) with NO
 dependencies, that is the last leaf of my deps tree. The transitive_dependee
 returned by FindTargetToTuse turns out to be a NULL pointer and when

IsImported() is called on it, it makes the program crash.


You found the correct line.  The bad code was added along with the feature:

  http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e01cce28

This was a dumb mistake on my part.  I will fix it.  Meanwhile you can
avoid the crash by not making an imported target depend on a target
that does not exist.

-Brad
___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


Re: [CMake] Bug in cmake 2.8.4/5 when using IMPORTED static targets?

2011-08-04 Thread Brad King

On 8/4/2011 3:29 PM, Brad King wrote:

This was a dumb mistake on my part. I will fix it. Meanwhile you can
avoid the crash by not making an imported target depend on a target
that does not exist.


Fixed to ignore dangling dependencies instead of crashing:

  http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ee9bbbd

This is now consistent with bad dependencies on non-imported targets.

-Brad
___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


[CMake] Setting MIDL Include path via cmake

2011-08-04 Thread Paul Whelan

Hi guys,

I'm new to the mailing list and fairly new to cmake itself, so I hope 
this isn't to basic a question to be posting here. Please refer me to 
the appropriate url/forum, etc if it is.


I have a windows COM project that I'm trying to convert to a cmake 
build. The IDL file in that project has includes of header files in it, 
so I need a way to set the MIDL compiler's include path from cmake. I 
don't see an obvious variable to set in cmake and the visual studio 
(2008) project that it generates comes up with a blank MIDL include 
path. Any suggestions on how to set that and maybe also where I should 
be looking for that type of info if it is readily available?


Thanks,
Paul
___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


Re: [CMake] Setting MIDL Include path via cmake

2011-08-04 Thread David Cole
Does calling

  include_directories(${CMAKE_CURRENT_BINARY_DIR})

before calling add_library work?


On Thu, Aug 4, 2011 at 4:14 PM, Paul Whelan pwhe...@aer.com wrote:
 Hi guys,

 I'm new to the mailing list and fairly new to cmake itself, so I hope this
 isn't to basic a question to be posting here. Please refer me to the
 appropriate url/forum, etc if it is.

 I have a windows COM project that I'm trying to convert to a cmake build.
 The IDL file in that project has includes of header files in it, so I need a
 way to set the MIDL compiler's include path from cmake. I don't see an
 obvious variable to set in cmake and the visual studio (2008) project that
 it generates comes up with a blank MIDL include path. Any suggestions on how
 to set that and maybe also where I should be looking for that type of info
 if it is readily available?

 Thanks,
 Paul
 ___
 Powered by www.kitware.com

 Visit other Kitware open-source projects at
 http://www.kitware.com/opensource/opensource.html

 Please keep messages on-topic and check the CMake FAQ at:
 http://www.cmake.org/Wiki/CMake_FAQ

 Follow this link to subscribe/unsubscribe:
 http://www.cmake.org/mailman/listinfo/cmake

___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


Re: [CMake] Bug fix requests for the *next* release of CMake...

2011-08-04 Thread Sean McBride
David,

http://public.kitware.com/Bug/view.php?id=12381

Cheers,

Sean


___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


[CMake] Accessing the parent directory of current directory

2011-08-04 Thread Vinay Raj Hampapur
Hello,
   I'm new to CMake and am trying to include files present in a
directory which is a sibling to my own. I want to acheive this by accessing
the parent directory and then moving into the other child directory.
Any help in this regard is greatly appreciated.

Thanks,
Vinay
___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake

Re: [CMake] Accessing the parent directory of current directory

2011-08-04 Thread J Decker
#include ../peer/peer.h ?

include_directories( ../peer )
#include peer.h


On Thu, Aug 4, 2011 at 4:48 PM, Vinay Raj Hampapur
vinayraj.hampa...@gmail.com wrote:
 Hello,
    I'm new to CMake and am trying to include files present in a
 directory which is a sibling to my own. I want to acheive this by accessing
 the parent directory and then moving into the other child directory.
 Any help in this regard is greatly appreciated.

 Thanks,
 Vinay

 ___
 Powered by www.kitware.com

 Visit other Kitware open-source projects at
 http://www.kitware.com/opensource/opensource.html

 Please keep messages on-topic and check the CMake FAQ at:
 http://www.cmake.org/Wiki/CMake_FAQ

 Follow this link to subscribe/unsubscribe:
 http://www.cmake.org/mailman/listinfo/cmake

___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


Re: [CMake] Accessing the parent directory of current directory

2011-08-04 Thread j s
Angle brackets  are for system files, use quotes instead.

include_directories( ../peer )
#include peer.h

Regards,

Juan

On Thu, Aug 4, 2011 at 6:52 PM, J Decker d3c...@gmail.com wrote:
 #include ../peer/peer.h ?

 include_directories( ../peer )
 #include peer.h


 On Thu, Aug 4, 2011 at 4:48 PM, Vinay Raj Hampapur
 vinayraj.hampa...@gmail.com wrote:
 Hello,
    I'm new to CMake and am trying to include files present in a
 directory which is a sibling to my own. I want to acheive this by accessing
 the parent directory and then moving into the other child directory.
 Any help in this regard is greatly appreciated.

 Thanks,
 Vinay

 ___
 Powered by www.kitware.com

 Visit other Kitware open-source projects at
 http://www.kitware.com/opensource/opensource.html

 Please keep messages on-topic and check the CMake FAQ at:
 http://www.cmake.org/Wiki/CMake_FAQ

 Follow this link to subscribe/unsubscribe:
 http://www.cmake.org/mailman/listinfo/cmake

 ___
 Powered by www.kitware.com

 Visit other Kitware open-source projects at 
 http://www.kitware.com/opensource/opensource.html

 Please keep messages on-topic and check the CMake FAQ at: 
 http://www.cmake.org/Wiki/CMake_FAQ

 Follow this link to subscribe/unsubscribe:
 http://www.cmake.org/mailman/listinfo/cmake

___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


Re: [CMake] Accessing the parent directory of current directory

2011-08-04 Thread Vinay Raj Hampapur

 er..
 Here's the directory structure I'm working with :
 Alice
   +Steve
+ steve.cpp
+ steve.h
   +Bob
 + bob.cpp
 + bob.h



The CMakeLists.txt file is in the Bob folder. I'm trying to include the
files from the Steve folder in my final build solution. Doing a
include_directories(../Steve) did not solve my problem.
Any advice?

Thanks,
Vinay

On Thu, Aug 4, 2011 at 5:00 PM, j s j.s4...@gmail.com wrote:

 Angle brackets  are for system files, use quotes instead.

 include_directories( ../peer )
 #include peer.h

 Regards,

 Juan

 On Thu, Aug 4, 2011 at 6:52 PM, J Decker d3c...@gmail.com wrote:
  #include ../peer/peer.h ?
 
  include_directories( ../peer )
  #include peer.h
 
 
  On Thu, Aug 4, 2011 at 4:48 PM, Vinay Raj Hampapur
  vinayraj.hampa...@gmail.com wrote:
  Hello,
 I'm new to CMake and am trying to include files present in a
  directory which is a sibling to my own. I want to acheive this by
 accessing
  the parent directory and then moving into the other child directory.
  Any help in this regard is greatly appreciated.
 
  Thanks,
  Vinay
 
  ___
  Powered by www.kitware.com
 
  Visit other Kitware open-source projects at
  http://www.kitware.com/opensource/opensource.html
 
  Please keep messages on-topic and check the CMake FAQ at:
  http://www.cmake.org/Wiki/CMake_FAQ
 
  Follow this link to subscribe/unsubscribe:
  http://www.cmake.org/mailman/listinfo/cmake
 
  ___
  Powered by www.kitware.com
 
  Visit other Kitware open-source projects at
 http://www.kitware.com/opensource/opensource.html
 
  Please keep messages on-topic and check the CMake FAQ at:
 http://www.cmake.org/Wiki/CMake_FAQ
 
  Follow this link to subscribe/unsubscribe:
  http://www.cmake.org/mailman/listinfo/cmake
 

___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake

Re: [CMake] Accessing the parent directory of current directory

2011-08-04 Thread j s
Did you try the quotation marks, instead of angle brackets?  Angle
brackets won't allow bob.cpp to see bob.h.

If you want to be pedantic.
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/Steve.

Also make sure that you completely regenerate your cmake build
directory, by at least deleting CMakeCache.txt, since that is often
what it takes when some configuration item changes.

Regards,

JUan

On Thu, Aug 4, 2011 at 7:08 PM, Vinay Raj Hampapur
vinayraj.hampa...@gmail.com wrote:
 er..
 Here's the directory structure I'm working with :
 Alice
   +    Steve
    + steve.cpp
    + steve.h
   +    Bob
     + bob.cpp
     + bob.h


 The CMakeLists.txt file is in the Bob folder. I'm trying to include the
 files from the Steve folder in my final build solution. Doing a
 include_directories(../Steve) did not solve my problem.
 Any advice?

 Thanks,
 Vinay

 On Thu, Aug 4, 2011 at 5:00 PM, j s j.s4...@gmail.com wrote:

 Angle brackets  are for system files, use quotes instead.

 include_directories( ../peer )
 #include peer.h

 Regards,

 Juan

 On Thu, Aug 4, 2011 at 6:52 PM, J Decker d3c...@gmail.com wrote:
  #include ../peer/peer.h ?
 
  include_directories( ../peer )
  #include peer.h
 
 
  On Thu, Aug 4, 2011 at 4:48 PM, Vinay Raj Hampapur
  vinayraj.hampa...@gmail.com wrote:
  Hello,
     I'm new to CMake and am trying to include files present in a
  directory which is a sibling to my own. I want to acheive this by
  accessing
  the parent directory and then moving into the other child directory.
  Any help in this regard is greatly appreciated.
 
  Thanks,
  Vinay
 
  ___
  Powered by www.kitware.com
 
  Visit other Kitware open-source projects at
  http://www.kitware.com/opensource/opensource.html
 
  Please keep messages on-topic and check the CMake FAQ at:
  http://www.cmake.org/Wiki/CMake_FAQ
 
  Follow this link to subscribe/unsubscribe:
  http://www.cmake.org/mailman/listinfo/cmake
 
  ___
  Powered by www.kitware.com
 
  Visit other Kitware open-source projects at
  http://www.kitware.com/opensource/opensource.html
 
  Please keep messages on-topic and check the CMake FAQ at:
  http://www.cmake.org/Wiki/CMake_FAQ
 
  Follow this link to subscribe/unsubscribe:
  http://www.cmake.org/mailman/listinfo/cmake
 


___
Powered by www.kitware.com

Visit other Kitware open-source projects at 
http://www.kitware.com/opensource/opensource.html

Please keep messages on-topic and check the CMake FAQ at: 
http://www.cmake.org/Wiki/CMake_FAQ

Follow this link to subscribe/unsubscribe:
http://www.cmake.org/mailman/listinfo/cmake


[Cmake-commits] CMake branch, master, updated. v2.8.5-139-g5f0eba4

2011-08-04 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  5f0eba49f2978b65b39b0c2bb9079be53c5c7d47 (commit)
  from  f31def8c6225bc1cbb716c1d3e0fdc6b71afa55c (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=5f0eba49f2978b65b39b0c2bb9079be53c5c7d47
commit 5f0eba49f2978b65b39b0c2bb9079be53c5c7d47
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Aug 4 08:29:30 2011 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Aug 4 08:30:05 2011 -0400

KWSys: Avoid conversion warning in SystemTools::GetTime

Convert struct timeval members to double explicitly to avoid a GCC
warning with -Wconversion.

diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx
index d1f1591..c4aff4a 100644
--- a/Source/kwsys/SystemTools.cxx
+++ b/Source/kwsys/SystemTools.cxx
@@ -296,7 +296,7 @@ double SystemTools::GetTime(void)
 #else
   struct timeval t;
   gettimeofday(t, 0);
-  return 1.0*t.tv_sec + 0.01*t.tv_usec;
+  return 1.0*double(t.tv_sec) + 0.01*double(t.tv_usec);
 #endif
 }
 

---

Summary of changes:
 Source/kwsys/SystemTools.cxx |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-1430-gf1f2f01

2011-08-04 Thread Brad King
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  f1f2f01f58f68f6c57cc373cfcdb65b6552ca392 (commit)
   via  5f0eba49f2978b65b39b0c2bb9079be53c5c7d47 (commit)
   via  f31def8c6225bc1cbb716c1d3e0fdc6b71afa55c (commit)
  from  5b33b48429b24279150e35e6ce2a632616b46ad8 (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=f1f2f01f58f68f6c57cc373cfcdb65b6552ca392
commit f1f2f01f58f68f6c57cc373cfcdb65b6552ca392
Merge: 5b33b48 5f0eba4
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Aug 4 08:30:23 2011 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Aug 4 08:30:23 2011 -0400

Merge branch 'master' into next


---

Summary of changes:
 Source/kwsys/SystemTools.cxx  |2 +-
 Source/kwsys/kwsysDateStamp.cmake |2 +-
 2 files changed, 2 insertions(+), 2 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-1432-g6947e83

2011-08-04 Thread David Cole
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  6947e837f3b4298ae5db3a7bed51dbb7359e8943 (commit)
   via  d87eb350f6b7c810145205fb6819e3174efdcc23 (commit)
  from  f1f2f01f58f68f6c57cc373cfcdb65b6552ca392 (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=6947e837f3b4298ae5db3a7bed51dbb7359e8943
commit 6947e837f3b4298ae5db3a7bed51dbb7359e8943
Merge: f1f2f01 d87eb35
Author: David Cole david.c...@kitware.com
AuthorDate: Thu Aug 4 13:23:13 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Aug 4 13:23:13 2011 -0400

Merge topic 'fix-12259-quote-commas-for-xcode' into next

d87eb35 Xcode: Quote ',' in Xcode string values (#12259)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d87eb350f6b7c810145205fb6819e3174efdcc23
commit d87eb350f6b7c810145205fb6819e3174efdcc23
Author: Johan Björk p...@spotify.com
AuthorDate: Thu Jun 9 10:36:53 2011 +0200
Commit: David Cole david.c...@kitware.com
CommitDate: Thu Aug 4 13:03:44 2011 -0400

Xcode: Quote ',' in Xcode string values (#12259)

diff --git a/Source/cmXCodeObject.cxx b/Source/cmXCodeObject.cxx
index 71c7c25..30e5076 100644
--- a/Source/cmXCodeObject.cxx
+++ b/Source/cmXCodeObject.cxx
@@ -241,7 +241,7 @@ void cmXCodeObject::PrintString(std::ostream 
os,cmStdString String)
   // considered special by the Xcode project file parser.
   bool needQuote =
 (String.empty() ||
- String.find_first_of( .+-=@$[]) != String.npos);
+ String.find_first_of( .+-=@$[],) != String.npos);
   const char* quote = needQuote? \ : ;
 
   // Print the string, quoted and escaped as necessary.

---

Summary of changes:
 Source/cmXCodeObject.cxx |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-1434-ge5afff8

2011-08-04 Thread Brad King
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  e5afff8349c41063f5b6844b86240253ec9f923c (commit)
   via  8ee9bbbd0ca5aab5bceb2dc9dda041e5745ffc19 (commit)
  from  6947e837f3b4298ae5db3a7bed51dbb7359e8943 (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=e5afff8349c41063f5b6844b86240253ec9f923c
commit e5afff8349c41063f5b6844b86240253ec9f923c
Merge: 6947e83 8ee9bbb
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Aug 4 15:39:46 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Aug 4 15:39:46 2011 -0400

Merge topic 'fix-imported-target-depend-crash' into next

8ee9bbb Do not crash when an imported target depends on a missing target


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ee9bbbd0ca5aab5bceb2dc9dda041e5745ffc19
commit 8ee9bbbd0ca5aab5bceb2dc9dda041e5745ffc19
Author: Brad King brad.k...@kitware.com
AuthorDate: Thu Aug 4 15:35:59 2011 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Thu Aug 4 15:36:32 2011 -0400

Do not crash when an imported target depends on a missing target

Commit e01cce28 (Allow add_dependencies() on imported targets,
2010-11-19) forgot to check if the dependee exists before using it.

diff --git a/Source/cmComputeTargetDepends.cxx 
b/Source/cmComputeTargetDepends.cxx
index a4ca363..3a0ed06 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -276,9 +276,11 @@ void cmComputeTargetDepends::AddTargetDepend(int 
depender_index,
 for(std::setcmStdString::const_iterator i = utils.begin();
 i != utils.end(); ++i)
   {
-  cmTarget* transitive_dependee =
-dependee-GetMakefile()-FindTargetToUse(i-c_str());
-  this-AddTargetDepend(depender_index, transitive_dependee, false);
+  if(cmTarget* transitive_dependee =
+ dependee-GetMakefile()-FindTargetToUse(i-c_str()))
+{
+this-AddTargetDepend(depender_index, transitive_dependee, false);
+}
   }
 }
   else

---

Summary of changes:
 Source/cmComputeTargetDepends.cxx |8 +---
 1 files changed, 5 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-1436-g0a11f45

2011-08-04 Thread David Cole
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  0a11f45fc097b6e8850d0e485c47c1c7d84a7b19 (commit)
   via  312d68d5b195255356b444f34be50552bc8981d4 (commit)
  from  e5afff8349c41063f5b6844b86240253ec9f923c (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=0a11f45fc097b6e8850d0e485c47c1c7d84a7b19
commit 0a11f45fc097b6e8850d0e485c47c1c7d84a7b19
Merge: e5afff8 312d68d
Author: David Cole david.c...@kitware.com
AuthorDate: Thu Aug 4 16:44:19 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Aug 4 16:44:19 2011 -0400

Merge topic 'enable-parallel-xcode-builds' into next

312d68d Xcode: Rearrange CMakeReRun to enable parallel builds


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=312d68d5b195255356b444f34be50552bc8981d4
commit 312d68d5b195255356b444f34be50552bc8981d4
Author: Johan Björk p...@spotify.com
AuthorDate: Tue Jul 26 23:13:42 2011 +0200
Commit: David Cole david.c...@kitware.com
CommitDate: Thu Aug 4 16:31:45 2011 -0400

Xcode: Rearrange CMakeReRun to enable parallel builds

by isolating the CMakeReRun steps to a ZERO_CHECK target, as
in the Visual Studio generators. Also, honor the value of
CMAKE_SUPPRESS_REGENERATION.

diff --git a/Source/cmGlobalXCodeGenerator.cxx 
b/Source/cmGlobalXCodeGenerator.cxx
index b3e2e7a..fd9dacd 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -336,6 +336,9 @@ cmGlobalXCodeGenerator::PostBuildMakeTarget(std::string 
const tName,
 }
 
 //
+#define CMAKE_CHECK_BUILD_SYSTEM_TARGET ZERO_CHECK
+
+//
 void
 cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
 std::vectorcmLocalGenerator* gens)
@@ -366,8 +369,18 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* 
root,
   makecommand.push_back(this-CurrentXCodeHackMakefile.c_str());
   makecommand.push_back(); // placeholder, see below
 
-  // Add Re-Run CMake rules
-  this-CreateReRunCMakeFile(root, gens);
+  // Add ZERO_CHECK
+  bool regenerate = !mf-IsOn(CMAKE_SUPPRESS_REGENERATION);
+  if (regenerate)
+{
+this-CreateReRunCMakeFile(root, gens);
+std::string file = this-ConvertToRelativeForMake(
+  this-CurrentReRunCMakeMakefile.c_str());
+cmSystemTools::ReplaceString(file, \\ ,  );
+mf-AddUtilityCommand(CMAKE_CHECK_BUILD_SYSTEM_TARGET, true, no_depends,
+  no_working_directory,
+  make, -f, file.c_str());
+}
 
   // now make the allbuild depend on all the non-utility targets
   // in the project
@@ -379,10 +392,17 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* 
root,
   {
   continue;
   }
+
 cmTargets tgts = lg-GetMakefile()-GetTargets();
 for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
   {
   cmTarget target = l-second;
+
+  if (regenerate  (l-first != CMAKE_CHECK_BUILD_SYSTEM_TARGET))
+{
+target.AddUtility(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
+}
+
   // make all exe, shared libs and modules
   // run the depend check makefile as a post build rule
   // this will make sure that when the next target is built
@@ -402,8 +422,8 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* 
root,
 cmTarget::POST_BUILD,
 Depend check for xcode,
 dir.c_str());
-
 }
+
   if(!target.GetPropertyAsBool(EXCLUDE_FROM_ALL))
 {
 allbuild-AddUtility(target.GetName());
@@ -1114,11 +1134,6 @@ void 
cmGlobalXCodeGenerator::CreateCustomCommands(cmXCodeObject* buildPhases,
   commands.push_back(*(*i)-GetCustomCommand());
   }
 }
-  std::vectorcmCustomCommand reruncom;
-  cmXCodeObject* cmakeReRunPhase =
-this-CreateBuildPhase(CMake ReRun, cmakeReRunPhase,
-   cmtarget, reruncom);
-  buildPhases-AddObject(cmakeReRunPhase);
   // create prebuild phase
   cmXCodeObject* cmakeRulesBuildPhase =
 this-CreateBuildPhase(CMake Rules,
@@ -1207,20 +1222,6 @@ 
cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
 const  commands,
 const char* name)
 {
-  if(strcmp(name, cmakeReRunPhase) == 0)
-{
-std::string cdir = 

[Cmake-commits] CMake branch, next, updated. v2.8.5-1438-gad06fe1

2011-08-04 Thread David Cole
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  ad06fe1175ae0e9f45290411fd5069c5dc96a819 (commit)
   via  edcdfeae9311ed5f5e9add23345b1ba9f0961982 (commit)
  from  0a11f45fc097b6e8850d0e485c47c1c7d84a7b19 (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=ad06fe1175ae0e9f45290411fd5069c5dc96a819
commit ad06fe1175ae0e9f45290411fd5069c5dc96a819
Merge: 0a11f45 edcdfea
Author: David Cole david.c...@kitware.com
AuthorDate: Thu Aug 4 19:14:40 2011 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Thu Aug 4 19:14:40 2011 -0400

Merge topic 'fix-10941-correct-comments' into next

edcdfea Documentation: Fix comments in the source code (#10941)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=edcdfeae9311ed5f5e9add23345b1ba9f0961982
commit edcdfeae9311ed5f5e9add23345b1ba9f0961982
Author: David Cole david.c...@kitware.com
AuthorDate: Thu Aug 4 19:03:24 2011 -0400
Commit: David Cole david.c...@kitware.com
CommitDate: Thu Aug 4 19:03:24 2011 -0400

Documentation: Fix comments in the source code (#10941)

Previously, the comments had all been copied and pasted
and not fixed up... Now they are fixed up.

diff --git a/Source/cmBuildCommand.h b/Source/cmBuildCommand.h
index 703ff88..1d247d2 100644
--- a/Source/cmBuildCommand.h
+++ b/Source/cmBuildCommand.h
@@ -15,9 +15,9 @@
 #include cmCommand.h
 
 /** \class cmBuildCommand
- * \brief Build a CMAKE variable
+ * \brief build_command command
  *
- * cmBuildCommand sets a variable to a value with expansion.  
+ * cmBuildCommand implements the build_command CMake command
  */
 class cmBuildCommand : public cmCommand
 {
diff --git a/Source/cmBuildNameCommand.h b/Source/cmBuildNameCommand.h
index 35c0ae0..29a680f 100644
--- a/Source/cmBuildNameCommand.h
+++ b/Source/cmBuildNameCommand.h
@@ -15,9 +15,9 @@
 #include cmCommand.h
 
 /** \class cmBuildNameCommand
- * \brief BuildName a CMAKE variable
+ * \brief build_name command
  *
- * cmBuildNameCommand sets a variable to a value with expansion.
+ * cmBuildNameCommand implements the build_name CMake command
  */
 class cmBuildNameCommand : public cmCommand
 {
diff --git a/Source/cmCMakeMinimumRequired.h b/Source/cmCMakeMinimumRequired.h
index 9bf7ef8..1121386 100644
--- a/Source/cmCMakeMinimumRequired.h
+++ b/Source/cmCMakeMinimumRequired.h
@@ -15,9 +15,9 @@
 #include cmCommand.h
 
 /** \class cmCMakeMinimumRequired
- * \brief Build a CMAKE variable
+ * \brief cmake_minimum_required command
  *
- * cmCMakeMinimumRequired sets a variable to a value with expansion.  
+ * cmCMakeMinimumRequired implements the cmake_minimum_required CMake command
  */
 class cmCMakeMinimumRequired : public cmCommand
 {
diff --git a/Source/cmMarkAsAdvancedCommand.h b/Source/cmMarkAsAdvancedCommand.h
index 0a5eb9e..26e0a07 100644
--- a/Source/cmMarkAsAdvancedCommand.h
+++ b/Source/cmMarkAsAdvancedCommand.h
@@ -15,9 +15,9 @@
 #include cmCommand.h
 
 /** \class cmMarkAsAdvancedCommand
- * \brief MarkAsAdvanced a CMAKE variable
+ * \brief mark_as_advanced command
  *
- * cmMarkAsAdvancedCommand sets a variable to a value with expansion.  
+ * cmMarkAsAdvancedCommand implements the mark_as_advanced CMake command
  */
 class cmMarkAsAdvancedCommand : public cmCommand
 {
diff --git a/Source/cmRemoveCommand.h b/Source/cmRemoveCommand.h
index 87c416f..bae2ee1 100644
--- a/Source/cmRemoveCommand.h
+++ b/Source/cmRemoveCommand.h
@@ -15,9 +15,9 @@
 #include cmCommand.h
 
 /** \class cmRemoveCommand
- * \brief Set a CMAKE variable
+ * \brief remove command
  *
- * cmRemoveCommand sets a variable to a value with expansion.  
+ * cmRemoveCommand implements the remove CMake command
  */
 class cmRemoveCommand : public cmCommand
 {
diff --git a/Source/cmSeparateArgumentsCommand.h 
b/Source/cmSeparateArgumentsCommand.h
index 10b3c40..736f066 100644
--- a/Source/cmSeparateArgumentsCommand.h
+++ b/Source/cmSeparateArgumentsCommand.h
@@ -15,9 +15,9 @@
 #include cmCommand.h
 
 /** \class cmSeparateArgumentsCommand
- * \brief SeparateArguments a CMAKE variable
+ * \brief separate_arguments command
  *
- * cmSeparateArgumentsCommand sets a variable to a value with expansion.  
+ * cmSeparateArgumentsCommand implements the separate_arguments CMake command
  */
 class cmSeparateArgumentsCommand : public cmCommand
 {
diff --git a/Source/cmSiteNameCommand.h b/Source/cmSiteNameCommand.h
index 6357569..ac7f426 100644
--- a/Source/cmSiteNameCommand.h
+++ b/Source/cmSiteNameCommand.h
@@ -15,9 +15,9 @@
 #include cmCommand.h
 
 /** \class cmSiteNameCommand
- * \brief SiteName a CMAKE variable
+ * \brief site_name command