[cmake-developers] CMake and CPack automated testing

2014-10-15 Thread Domen Vrankar 
Hi,

I was looking at CMake automated tests and did not quite understand how
they are intended to be written.

Do they only test for e.g. if CPack executes without errors or do they
check generated files content (e.g. diff or call for e.g. rpm -qi
some_pkg.rpm and then diff the output)? I'm not certain how in-depth the
automated tests should be.

Is there a cmake developers wiki page or some other reference with
guidelines on how to write automated tests for CMake and CPack?

Thanks,
Domen
-- 

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers

Re: [cmake-developers] CMake and CPack automated testing

2014-10-15 Thread Eric Noulard 
2014-10-15 9:30 GMT+02:00 Domen Vrankar domen.vran...@gmail.com:

 Hi,

 I was looking at CMake automated tests and did not quite understand how
 they are intended to be written.

 Do they only test for e.g. if CPack executes without errors or do they
 check generated files content (e.g. diff or call for e.g. rpm -qi
 some_pkg.rpm and then diff the output)? I'm not certain how in-depth the
 automated tests should be.


The current CPack test inside the CMake source tree are very simple they
only check whether if cpack runs properly in various situation
for various CPack generator. e.g. the CPackComponentsForAll test is run
for the available CPack generator on the current platform
and counts if the number of generated package file is the appropriate
one, see
CMakeRootSource/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake

The other tests CPackComponents and CPackTestAllGenerators only verifies
that cpack run and terminates OK.
The logic of activation of the various CPack generator is in:
CMakeRootSource/Tests/CMakeLists.txt

inside this file reads e.g.: if(CTEST_RUN_CPackComponentsForAll)  and the
following lines.

Doing more semantic checks e.g. running rpm -qi then compare to a
reference file etc... would be indeed very nice.
The thing is the combinatorial explosion of what you can generate for each
CPack generator is high but any more semantic
test for any CPack generator would be (I think) a good point.


 Is there a cmake developers wiki page or some other reference with
 guidelines on how to write automated tests for CMake and CPack?


I don't think there is anything like that, but that would be very helpful.



 Thanks,
 Domen

 --

 Powered by www.kitware.com

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

 Kitware offers various services to support the CMake community. For more
 information on each offering, please visit:

 CMake Support: http://cmake.org/cmake/help/support.html
 CMake Consulting: http://cmake.org/cmake/help/consulting.html
 CMake Training Courses: http://cmake.org/cmake/help/training.html

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

 Follow this link to subscribe/unsubscribe:
 http://public.kitware.com/mailman/listinfo/cmake-developers




-- 
Erk
L'élection n'est pas la démocratie -- http://www.le-message.org
-- 

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers

[cmake-developers] FindBoost.cmake cannot find some libraries when cross-compiling

2014-10-15 Thread Guillaume Papin 
Hello CMake developers,

I have a cross-compiled version of Boost and some other libraries under 
~/my-project/CrossThirdPartyPrefix.

I invoke CMake with a CMAKE_TOOLCHAIN_FILE and also I sets CMAKE_FIND_ROOT_PATH
to the directory where my cross-compiled Boost is installed.

cmake 
-DCMAKE_TOOLCHAIN_FILE=$HOME/my-project/plateforms/arm-toolchain.cmake \
-DCMAKE_FIND_ROOT_PATH=$HOME/my-project/CrossThirdPartyPrefix \
~/my-projects/src/

But I have an error when using FindBoost.cmake:

In my project's CMakeLists.txt:
find_package(Boost 1.53.0 REQUIRED COMPONENTS atomic thread system)

The error:
 CMake Error at .../share/cmake-3.0/Modules/FindBoost.cmake:1179 (message):
   Unable to find the requested Boost libraries.

   Boost version: 1.55.0

   Boost include path:
   ~/myproject/CrossThirdPartyPrefix/include


   Could not find the following Boost libraries:

   boost_thread
   boost_system

   Some (but not all) of the required Boost libraries were found.  You may
   need to install these additional Boost libraries.  Alternatively, set
   BOOST_LIBRARYDIR to the directory containing Boost libraries or 
BOOST_ROOT
   to the location of Boost.


So the first component library (atomic) is found but not the other ones.

Looking at the code, when the first library is found, Boost_LIBRARY_DIR is set
to the directory that contains the library and then change the further calls of
find_library to use Boost_LIBRARY_DIR as the unique HINTS, and with the
NO_DEFAULT_PATH options set.

macro(_Boost_FIND_LIBRARY var)
  find_library(${var} ${ARGN})

  if(${var})
# If this is the first library found then save Boost_LIBRARY_DIR.
if(NOT Boost_LIBRARY_DIR)
  get_filename_component(_dir ${${var}} PATH)
  set(Boost_LIBRARY_DIR ${_dir} CACHE PATH Boost library directory 
FORCE)
endif()
  elseif(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT)
# Try component-specific hints but do not save Boost_LIBRARY_DIR.
find_library(${var} HINTS ${_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT} 
${ARGN})
  endif()

  # If Boost_LIBRARY_DIR is known then search only there.
  if(Boost_LIBRARY_DIR)
set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR} NO_DEFAULT_PATH)
  endif()
endmacro()

* 
https://github.com/Kitware/CMake/blob/1b3495d32e1523648da08e138482a654f8765333/Modules/FindBoost.cmake#L322-L325

The issue is that, when using CMAKE_FIND_ROOT_PATH, the Boost_LIBRARY_DIR of the
host (~/myproject/CrossThirdPartyPrefix/lib/ in my case), will be expanded 
against the root paths.

To find my libraries I can apply the following fix but I'm not sure if it's the
right solution or not.

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 3642b3e..aad6575 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -321,7 +321,7 @@ macro(_Boost_FIND_LIBRARY var)
 
   # If Boost_LIBRARY_DIR is known then search only there.
   if(Boost_LIBRARY_DIR)
-set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR} NO_DEFAULT_PATH)
+set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR} NO_DEFAULT_PATH 
NO_CMAKE_FIND_ROOT_PATH)
   endif()
 endmacro()
 
@@ -855,7 +855,7 @@ if(_Boost_CHANGE_LIBDIR AND NOT 
_Boost_LIBRARY_DIR_CHANGED)
 endif()
 
 if(Boost_LIBRARY_DIR)
-  set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR} NO_DEFAULT_PATH)
+  set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR} NO_DEFAULT_PATH 
NO_CMAKE_FIND_ROOT_PATH)
 else()
   set(_boost_LIBRARY_SEARCH_DIRS )
   if(BOOST_LIBRARYDIR)


What I'm wondering is, whether or not Boost_LIBRARY_DIR should be a path on the 
target or on the host?

Right now, the workaround I have that doesn't require to modify FindBoost.cmake
is to set Boost_LIBRARY_DIR to /lib/, which will be expanded against the 
CMAKE_FIND_ROOT_PATH.

By the way, I'm a happy CMake user, thanks for all the work!
Guillaume
-- 

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake-developers

Re: [cmake-developers] FindBoost.cmake cannot find some libraries when cross-compiling

2014-10-15 Thread Chuck Atkins 
Can you post your toolchain file as well?  Does it set any of the
CMAKE_FIND_ROOT_PATHG_MODE_{INCLUDE,PROGRAM,LIBRARY,PACKAGE} variables to
anything?

- Chuck

On Wed, Oct 15, 2014 at 10:04 AM, Guillaume Papin 
guillaume.pa...@parrot.com wrote:

 Hello CMake developers,

 I have a cross-compiled version of Boost and some other libraries under
 ~/my-project/CrossThirdPartyPrefix.

 I invoke CMake with a CMAKE_TOOLCHAIN_FILE and also I sets
 CMAKE_FIND_ROOT_PATH
 to the directory where my cross-compiled Boost is installed.

 cmake
 -DCMAKE_TOOLCHAIN_FILE=$HOME/my-project/plateforms/arm-toolchain.cmake \
 -DCMAKE_FIND_ROOT_PATH=$HOME/my-project/CrossThirdPartyPrefix \
 ~/my-projects/src/

 But I have an error when using FindBoost.cmake:

 In my project's CMakeLists.txt:
 find_package(Boost 1.53.0 REQUIRED COMPONENTS atomic thread system)

 The error:
  CMake Error at .../share/cmake-3.0/Modules/FindBoost.cmake:1179
 (message):
Unable to find the requested Boost libraries.

Boost version: 1.55.0

Boost include path:
~/myproject/CrossThirdPartyPrefix/include


Could not find the following Boost libraries:

boost_thread
boost_system

Some (but not all) of the required Boost libraries were found.  You
 may
need to install these additional Boost libraries.  Alternatively,
 set
BOOST_LIBRARYDIR to the directory containing Boost libraries or
 BOOST_ROOT
to the location of Boost.


 So the first component library (atomic) is found but not the other ones.

 Looking at the code, when the first library is found, Boost_LIBRARY_DIR is
 set
 to the directory that contains the library and then change the further
 calls of
 find_library to use Boost_LIBRARY_DIR as the unique HINTS, and with the
 NO_DEFAULT_PATH options set.

 macro(_Boost_FIND_LIBRARY var)
   find_library(${var} ${ARGN})

   if(${var})
 # If this is the first library found then save Boost_LIBRARY_DIR.
 if(NOT Boost_LIBRARY_DIR)
   get_filename_component(_dir ${${var}} PATH)
   set(Boost_LIBRARY_DIR ${_dir} CACHE PATH Boost library
 directory FORCE)
 endif()
   elseif(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT)
 # Try component-specific hints but do not save Boost_LIBRARY_DIR.
 find_library(${var} HINTS
 ${_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT} ${ARGN})
   endif()

   # If Boost_LIBRARY_DIR is known then search only there.
   if(Boost_LIBRARY_DIR)
 set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR}
 NO_DEFAULT_PATH)
   endif()
 endmacro()

 *
 https://github.com/Kitware/CMake/blob/1b3495d32e1523648da08e138482a654f8765333/Modules/FindBoost.cmake#L322-L325

 The issue is that, when using CMAKE_FIND_ROOT_PATH, the Boost_LIBRARY_DIR
 of the
 host (~/myproject/CrossThirdPartyPrefix/lib/ in my case), will be expanded
 against the root paths.

 To find my libraries I can apply the following fix but I'm not sure if
 it's the
 right solution or not.

 diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
 index 3642b3e..aad6575 100644
 --- a/Modules/FindBoost.cmake
 +++ b/Modules/FindBoost.cmake
 @@ -321,7 +321,7 @@ macro(_Boost_FIND_LIBRARY var)

# If Boost_LIBRARY_DIR is known then search only there.
if(Boost_LIBRARY_DIR)
 -set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR}
 NO_DEFAULT_PATH)
 +set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR}
 NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
endif()
  endmacro()

 @@ -855,7 +855,7 @@ if(_Boost_CHANGE_LIBDIR AND NOT
 _Boost_LIBRARY_DIR_CHANGED)
  endif()

  if(Boost_LIBRARY_DIR)
 -  set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR} NO_DEFAULT_PATH)
 +  set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR} NO_DEFAULT_PATH
 NO_CMAKE_FIND_ROOT_PATH)
  else()
set(_boost_LIBRARY_SEARCH_DIRS )
if(BOOST_LIBRARYDIR)


 What I'm wondering is, whether or not Boost_LIBRARY_DIR should be a path
 on the target or on the host?

 Right now, the workaround I have that doesn't require to modify
 FindBoost.cmake
 is to set Boost_LIBRARY_DIR to /lib/, which will be expanded against the
 CMAKE_FIND_ROOT_PATH.

 By the way, I'm a happy CMake user, thanks for all the work!
 Guillaume
 --

 Powered by www.kitware.com

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

 Kitware offers various services to support the CMake community. For more
 information on each offering, please visit:

 CMake Support: http://cmake.org/cmake/help/support.html
 CMake Consulting: http://cmake.org/cmake/help/consulting.html
 CMake Training Courses: http://cmake.org/cmake/help/training.html

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

 Follow this link to subscribe/unsubscribe:

Re: [cmake-developers] FindBoost.cmake cannot find some libraries when cross-compiling

2014-10-15 Thread Guillaume Papin 
Yes I'm setting these variables.

See my toolchain configuration below:

cmake_minimum_required(VERSION 3.0) # CMAKE_SYSROOT

set(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_SYSTEM_PROCESSOR armv7l)

set(LINARO_PACKAGE_ROOT /opt/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux/)
set(CMAKE_SYSROOT /home/user/my-project/my-custom-sysroot/)

set(ONLY_CMAKE_FIND_ROOT_PATH TRUE)
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)

set(CMAKE_C_COMPILER ${LINARO_PACKAGE_ROOT}/bin/arm-linux-gnueabihf-gcc)
set(CMAKE_CXX_COMPILER ${LINARO_PACKAGE_ROOT}/bin/arm-linux-gnueabihf-g++)

set(TOOLCHAIN_COMPILE_FLAGS
  -mtune=cortex-a15 -march=armv7-a -mthumb -mfloat-abi=hard -mfpu=neon-vfpv4)

set(CMAKE_C_FLAGS ${TOOLCHAIN_COMPILE_FLAGS} CACHE STRING
  Flags used by the compiler during all build types. FORCE)
set(CMAKE_CXX_FLAGS ${TOOLCHAIN_COMPILE_FLAGS} -std=c++11 CACHE STRING
  Flags used by the compiler during all build types. FORCE)
- Guillaume


From: Chuck Atkins [chuck.atk...@kitware.com]
Sent: 15 October 2014 16:40
To: Guillaume Papin
Cc: cmake-developers@cmake.org
Subject: Re: [cmake-developers] FindBoost.cmake cannot find some libraries when 
cross-compiling

Can you post your toolchain file as well?  Does it set any of the 
CMAKE_FIND_ROOT_PATHG_MODE_{INCLUDE,PROGRAM,LIBRARY,PACKAGE} variables to 
anything?

- Chuck

On Wed, Oct 15, 2014 at 10:04 AM, Guillaume Papin 
guillaume.pa...@parrot.commailto:guillaume.pa...@parrot.com wrote:
Hello CMake developers,

I have a cross-compiled version of Boost and some other libraries under 
~/my-project/CrossThirdPartyPrefix.

I invoke CMake with a CMAKE_TOOLCHAIN_FILE and also I sets CMAKE_FIND_ROOT_PATH
to the directory where my cross-compiled Boost is installed.

cmake 
-DCMAKE_TOOLCHAIN_FILE=$HOME/my-project/plateforms/arm-toolchain.cmake \
-DCMAKE_FIND_ROOT_PATH=$HOME/my-project/CrossThirdPartyPrefix \
~/my-projects/src/

But I have an error when using FindBoost.cmake:

In my project's CMakeLists.txt:
find_package(Boost 1.53.0 REQUIRED COMPONENTS atomic thread system)

The error:
 CMake Error at .../share/cmake-3.0/Modules/FindBoost.cmake:1179 (message):
   Unable to find the requested Boost libraries.

   Boost version: 1.55.0

   Boost include path:
   ~/myproject/CrossThirdPartyPrefix/include


   Could not find the following Boost libraries:

   boost_thread
   boost_system

   Some (but not all) of the required Boost libraries were found.  You may
   need to install these additional Boost libraries.  Alternatively, set
   BOOST_LIBRARYDIR to the directory containing Boost libraries or 
BOOST_ROOT
   to the location of Boost.


So the first component library (atomic) is found but not the other ones.

Looking at the code, when the first library is found, Boost_LIBRARY_DIR is set
to the directory that contains the library and then change the further calls of
find_library to use Boost_LIBRARY_DIR as the unique HINTS, and with the
NO_DEFAULT_PATH options set.

macro(_Boost_FIND_LIBRARY var)
  find_library(${var} ${ARGN})

  if(${var})
# If this is the first library found then save Boost_LIBRARY_DIR.
if(NOT Boost_LIBRARY_DIR)
  get_filename_component(_dir ${${var}} PATH)
  set(Boost_LIBRARY_DIR ${_dir} CACHE PATH Boost library directory 
FORCE)
endif()
  elseif(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT)
# Try component-specific hints but do not save Boost_LIBRARY_DIR.
find_library(${var} HINTS ${_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT} 
${ARGN})
  endif()

  # If Boost_LIBRARY_DIR is known then search only there.
  if(Boost_LIBRARY_DIR)
set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR} NO_DEFAULT_PATH)
  endif()
endmacro()

* 
https://github.com/Kitware/CMake/blob/1b3495d32e1523648da08e138482a654f8765333/Modules/FindBoost.cmake#L322-L325

The issue is that, when using CMAKE_FIND_ROOT_PATH, the Boost_LIBRARY_DIR of the
host (~/myproject/CrossThirdPartyPrefix/lib/ in my case), will be expanded 
against the root paths.

To find my libraries I can apply the following fix but I'm not sure if it's the
right solution or not.

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 3642b3e..aad6575 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -321,7 +321,7 @@ macro(_Boost_FIND_LIBRARY var)

   # If Boost_LIBRARY_DIR is known then search only there.
   if(Boost_LIBRARY_DIR)
-set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR} NO_DEFAULT_PATH)
+set(_boost_LIBRARY_SEARCH_DIRS ${Boost_LIBRARY_DIR} NO_DEFAULT_PATH 
NO_CMAKE_FIND_ROOT_PATH)
   endif()
 endmacro()

@@ -855,7 +855,7 @@ if(_Boost_CHANGE_LIBDIR AND NOT 
_Boost_LIBRARY_DIR_CHANGED)
 endif()

Re: [CMake] Specifying different compilers for subsets of a project

2014-10-15 Thread Marcel Loose 
Hi George,

You could (ab)use the assembler plugin system for that. Define your
own CMake-ASM-BGQ*.cmake files and use the assembler to compile the
sources.

Here's how I did this a couple of years ago for the BG/P.

In the CMakeLists.txt file for the files that need to be compiled with
the BG/P compiler I have:

## ---
## Enable BGP specific assembler.
## Use the BGP assembler also for linking C/C++ programs.
## ---
enable_language(ASM-BGP)
set(CMAKE_C_LINK_EXECUTABLE ${CMAKE_ASM-BGP_LINK_EXECUTABLE})
set(CMAKE_CXX_LINK_EXECUTABLE ${CMAKE_ASM-BGP_LINK_EXECUTABLE})

CMakeASM-BGPInformation.cmake:

set(ASM_DIALECT -BGP)
set(CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS S)
set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT CMAKE_ASM${ASM_DIALECT}_COMPILER 
DEFINES FLAGS -c -o OBJECT SOURCE)
set(CMAKE_ASM${ASM_DIALECT}_LINK_EXECUTABLE CMAKE_ASM${ASM_DIALECT}_COMPILER 
FLAGS LINK_FLAGS OBJECTS  -o TARGET LINK_LIBRARIES)
include(CMakeASMInformation)
set(ASM_DIALECT)


CMakeDetermineASM-BGPCompiler.cmake:

set(ASM_DIALECT -BGP)
set(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT ${CMAKE_ASM_COMPILER})
include(CMakeDetermineASMCompiler)
set(ASM_DIALECT)

CMakeTestASM-BGPCompiler.cmake:

set(ASM_DIALECT -BGP)
include(CMakeTestASMCompiler)
set(ASM_DIALECT)


Hope this helps.

Regards,
Marcel Loose.

On 15/10/14 04:23, George Zagaris wrote:
 Dear all,

 I am working on a project where on certain platforms, namely, on a
 BG/Q or Cray, we have to cross-compile the code, but still, there are
 parts of the code that should only be compiled for the front end,
 login nodes.

 Typically, we have a toolchain file, which among other things sets:
 - CMAKE_CXX_COMPILER
 - CMAKE_C_COMPILER
 - CMAKE_FORTRAN_COMPILER

 to the respective cross-compilers available on the target platform.

 This compiles everything for the back-end.

 The obvious way to compile front-end tools is to create another
 directory, e.g., front-end-build and run cmake therein to
 re-configure and build with a front-end compiler.

 However, since only a relatively small subset of the files needs to be
 compiled for the front-end, it is desirable to do this within the same
 build, which leads to my question:

 Is it possible to tell CMake to build certain files with a different
 compiler? I know there is a way to set file properties to control the
 compiler flags of certain files. Is there a blessed approach to
 control the compiler for certain files and/or directories (and avoid
 things like set(CMAKE_CXX_COMPILER...) within a CMakeLists file)?

 Thank you very much for all your help.

 Best,
 George

  



attachment: loose.vcf-- 

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake

Re: [CMake] 2 libs stuck together !

2014-10-15 Thread Johannes Zarl 
Hi,

It would be a lot easier to help you if you tried to minimize the 
CMakeLists.txt file before posting it to the list. The file as you posted it 
contains many unrelated stuff and even commented-out lines.

Not wanting to look at the whole thing as it is, my advice to you is to search 
for the lines in which you add the pthread and opencv_calib3d lines. Maybe you 
used quotes incorrectly when adding these lines...

Cheers,
  Johannes

On Thursday, 9. October 2014, 14:06:29, jay75 wrote:
 i am working on ros indigo, ubuntu 14.04 trusty, opencv 2.4.9
 
 i get this message:
 /usr/bin/ld: cannot find -lopencv_calib3dlibpthread
 
 now, libpthread.so.0  and libopencv_calib3d.so are two separate libs in
 /usr/lib/x86_64-linux-gnu/, which i have added successfully to my
 link_libraries. what am i doing wrong? here is my cmakelists.txt :
 cmake_minimum_required(VERSION 2.8.3)
 project(hal_main)
 
 find_package(cmake_modules REQUIRED)
 find_package(Eigen REQUIRED)
 find_package(Boost REQUIRED thread date_time system filesystem
 program_options python )
 
 ## Find catkin macros and libraries
 ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
 ## is used, also find other catkin packages
 find_package(catkin REQUIRED COMPONENTS
   actionlib
   actionlib_msgs
   message_generation
   roscpp
   rospy
   std_msgs
   genmsg
   visualization_msgs
   clam_controller
   clam_msgs
   pcl_ros
   cv_bridge
   eigen_conversions
   moveit_msgs
   geometry_msgs
   moveit_ros_planning
   moveit_ros_planning_interface
   tf
   tf_conversions
   moveit_simple_grasps
   cmake_modules
   moveit_core
   # eigen_conversions
 )
 
 
 
 find_package(OpenCV REQUIRED )
 find_package(OpenCV 2 REQUIRED )
 #find_package(OpenCV 2 REQUIRED COMPONENTS calib3dlibpthread)
 
 include_directories(${EIGEN_INCLUDE_DIRS})
 
 add_definitions(${EIGEN_DEFINITIONS})
 
 #SET( CMAKE_MODULE_PATH /usr/share/cmake-2.8/Modules/ )
 #set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
 ${CMAKE_SOURCE_DIR}/share/cmake_modules/cmake/Modules/)
 
 find_package(MySQL REQUIRED COMPONENTS libmysqlcppconn.so.7.1.1.3)
 include_directories(${MYSQL_INCLUDE_DIRS})
 add_definitions(${MYSQL_DEFINITIONS})
 #link_directories(/usr/lib/mysql/plugin/${MYSQL_LIBRARY_DIRS})
 
 
 
 #find_package(OpenCV2 REQUIRED)
 #find_package(mysql REQUIRED)
 ## System dependencies are found with CMake's conventions
 # find_package(Boost REQUIRED COMPONENTS system)
 
 
 ## Uncomment this if the package has a setup.py. This macro ensures
 ## modules and global scripts declared therein get installed
 ## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
 # catkin_python_setup()
 
 
 ## Declare ROS messages, services and actions ##
 
 
 ## To declare and build messages, services or actions from within this
 ## package, follow these steps:
 ## * Let MSG_DEP_SET be the set of packages whose message types you use in
 ##   your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...).
 ## * In the file package.xml:
 ##   * add a build_depend and a run_depend tag for each package in
 MSG_DEP_SET
 ##   * If MSG_DEP_SET isn't empty the following dependencies might have
 been ## pulled in transitively but can be declared for certainty
 nonetheless: ## * add a build_depend tag for message_generation
 ## * add a run_depend tag for message_runtime
 ## * In this file (CMakeLists.txt):
 ##   * add message_generation and every package in MSG_DEP_SET to
  #find_package(catkin REQUIRED COMPONENTS actionlib_msgs geometry_msgs
 moveit_msgs )
 ##   * add message_runtime and every package in MSG_DEP_SET to
 ## catkin_package(CATKIN_DEPENDS ...)
 ##   * uncomment the add_*_files sections below as needed
 ## and list every .msg/.srv/.action file to be processed
 ##   * uncomment the generate_messages entry below
 ##   * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES
 ...)
 
 ## Generate messages in the 'msg' folder
  add_message_files(
FILES
instr_set_arm.msg
instr_set_legs.msg
object.msg
  )
 
 ## Generate services in the 'srv' folder
 # add_service_files(
 #   FILES
 #   Service1.srv
 #   Service2.srv
 # )
 
 ## Generate actions in the 'action' folder
  add_action_files(
FILES
arminstr.action
leginstr.action
objrecog_posit.action
sendcommand.action
 
  )
 
 ## Generate added messages and services with any dependencies listed here
  generate_messages(
DEPENDENCIES
actionlib_msgs
std_msgs
geometry_msgs
moveit_msgs
 
  )
 
  catkin_package(
   CATKIN_DEPENDS
   actionlib
   actionlib_msgs
   message_generation
   roscpp
   rospy
   std_msgs
   genmsg
   visualization_msgs
   clam_controller
   clam_msgs
   pcl_ros
   cv_bridge
   eigen_conversions
   moveit_msgs
   geometry_msgs
   moveit_ros_planning
   moveit_ros_planning_interface
   tf
   tf_conversions
   moveit_simple_grasps
   moveit_core

[CMake] [CPack] RPM generator and directory symlink

2014-10-15 Thread Luc J. Bourhis 
Hi,

I am trying to package a hierarchy with the following feature:



and subdir-version does indeed exist in that lib directory. CPack create a
specs featuring



but then rpmbuild chokes on it with an error: not a directory:
/usr/local/lib/subdir. The %dir should not be there, should it?

This is with cpack 2.8.12.2 installed with yum on Fedora 20, and therefore
rpmbuild version 4.11.3.

Best wishes,

Luc J. Bourhis



-
--
Luc J. Bourhis

--
View this message in context: 
http://cmake.3232098.n2.nabble.com/CPack-RPM-generator-and-directory-symlink-tp7588751.html
Sent from the CMake mailing list archive at Nabble.com.
-- 

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake

Re: [CMake] [CPack] RPM generator and directory symlink

2014-10-15 Thread Luc J. Bourhis 
Just to make it crystal clear, subdir-version is a directory!



-
--
Luc J. Bourhis

--
View this message in context: 
http://cmake.3232098.n2.nabble.com/CPack-RPM-generator-and-directory-symlink-tp7588751p7588752.html
Sent from the CMake mailing list archive at Nabble.com.
-- 

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake

[CMake] [CPack] RPM generator and directory symlink

2014-10-15 Thread Luc Bourhis 
Hi,

I am trying to package a hierarchy with the following feature:

~ cd ROOT/usr/local/lib
~ ls -l subdir
subdir - subdir-version

and subdir-version does indeed exist in that lib directory. CPack create a 
specs featuring

%dir /usr/local/lib/subdir

but then rpmbuild chokes on it with an error: not a directory: 
/usr/local/lib/subdir. The %dir should not be there, should it?

This is with cpack 2.8.12.2 installed with yum on Fedora 20, and therefore 
rpmbuild version 4.11.3.

Best wishes,

Luc J. Bourhis



smime.p7s
Description: S/MIME cryptographic signature
-- 

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake

Re: [CMake] [CPack] RPM generator and directory symlink

2014-10-15 Thread Luc J. Bourhis 
According to  the answer to this bug report
https://bugzilla.redhat.com/show_bug.cgi?id=1005529  , rpmbuild changed
the way it deals with 



when foo or bar are actually symlinks. So it looks like CPack 2.8.12 has not
been changed accordingly. This looks like bug report material, doesn't it?




-
--
Luc J. Bourhis

--
View this message in context: 
http://cmake.3232098.n2.nabble.com/CPack-RPM-generator-and-directory-symlink-tp7588751p7588754.html
Sent from the CMake mailing list archive at Nabble.com.
-- 

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake

Re: [CMake] [CPack] RPM generator and directory symlink

2014-10-15 Thread Domen Vrankar 
Hi,

I'm assuming that you used something like:

install(CODE 
EXECUTE_PROCESS(COMMAND ln -sf ${SOME_PATH}/subdir-version subdir
   WORKING_DIRECTORY ${LOCATION_WHERE_CPackRPM_IS_PACKAGING_YOUR_FILES}
   )
 COMPONENT bin)

in your CMakeLists.txt

Currently CPackRPM doesn't automatically detect a symlink.

A workaround that you could use is to specify something like

set(CPACK_RPM_bin_USER_FILELIST %config /subdir)

and this will force CPackRPM to treat the symlink as a config file.

Please file a bug report regarding CPackRPM treating symlinks to
directories as directories and not as symlinks.

Regards,
Domen


2014-10-15 22:59 GMT+02:00 Luc J. Bourhis luc_j_bour...@mac.com:

 According to  the answer to this bug report
 https://bugzilla.redhat.com/show_bug.cgi?id=1005529  , rpmbuild changed
 the way it deals with



 when foo or bar are actually symlinks. So it looks like CPack 2.8.12 has
 not
 been changed accordingly. This looks like bug report material, doesn't it?




 -
 --
 Luc J. Bourhis

 --
 View this message in context:
 http://cmake.3232098.n2.nabble.com/CPack-RPM-generator-and-directory-symlink-tp7588751p7588754.html
 Sent from the CMake mailing list archive at Nabble.com.
 --

 Powered by www.kitware.com

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

 Kitware offers various services to support the CMake community. For more
 information on each offering, please visit:

 CMake Support: http://cmake.org/cmake/help/support.html
 CMake Consulting: http://cmake.org/cmake/help/consulting.html
 CMake Training Courses: http://cmake.org/cmake/help/training.html

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

 Follow this link to subscribe/unsubscribe:
 http://public.kitware.com/mailman/listinfo/cmake

-- 

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake

Re: [CMake] [CPack] RPM generator and directory symlink

2014-10-15 Thread Luc J. Bourhis 
Thanks for your help!


Domen Vrankar wrote
 I'm assuming that you used something like:
 
 install(CODE 
 EXECUTE_PROCESS(COMMAND ln -sf ${SOME_PATH}/subdir-version subdir
WORKING_DIRECTORY
 ${LOCATION_WHERE_CPackRPM_IS_PACKAGING_YOUR_FILES}
)
  COMPONENT bin)

No, I used install(DIRECTORY …). It was all built and installed using
External_Project. Thus the directory symlink was not created by my code.


Domen Vrankar wrote
 A workaround that you could use is to specify something like
 
 set(CPACK_RPM_bin_USER_FILELIST %config /subdir)
 
 and this will force CPackRPM to treat the symlink as a config file.

What is the meaning of bin in the middle of that variable name?



-
--
Luc J. Bourhis

--
View this message in context: 
http://cmake.3232098.n2.nabble.com/CPack-RPM-generator-and-directory-symlink-tp7588751p7588756.html
Sent from the CMake mailing list archive at Nabble.com.
-- 

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake

[CMake] INSTALL DIRECTORY patterns highly confusing

2014-10-15 Thread Dan Kegel 
The doc could use some more examples.  I am having a hard
time figuring out how to install a directory tree but exclude
files matching .gitignore and Makefile.in.
-- 

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake

Re: [CMake] Specifying different compilers for subsets of a project

2014-10-15 Thread George Zagaris 
Hi Marcel,

Thanks for your e-mail. I am not sure if your approach wil fully satisfy my
use case. I need to compile on both the back-end and front-end.

My question really boils down to whether it's possible to use two different
compilers for the same language within the same configuration.

I was hoping there would be a way to set properties on individual files or
directories and specify a different compiler (as one could specify
different compilers flags). Is that possible?

Perhaps, another alternative is to define a FRONTEND_C, FRONTEND_CXX and
FRONTEND_F90 languages, as well as, define associated
add_frontend_executable() and add_frontend_library(), which would work
with the frontend compiler when we are cross-compiling, or call
add_executable() and add_library otherwise. This may be a bit of
overkill though (but very useful), given that only a relative small subset
of the project needs to be compiled for the front-end.

Is there a good guide on how would one could define a different language in
CMake?

I am curious if there are any other known alternatives?

Cheers,
George

On Wed, Oct 15, 2014 at 1:54 AM, Marcel Loose lo...@astron.nl wrote:

  Hi George,

 You could (ab)use the assembler plugin system for that. Define your own
 CMake-ASM-BGQ*.cmake files and use the assembler to compile the sources.

 Here's how I did this a couple of years ago for the BG/P.

 In the CMakeLists.txt file for the files that need to be compiled with the
 BG/P compiler I have:

 ## ---
 ## Enable BGP specific assembler.
 ## Use the BGP assembler also for linking C/C++ programs.
 ## ---
 enable_language(ASM-BGP)
 set(CMAKE_C_LINK_EXECUTABLE ${CMAKE_ASM-BGP_LINK_EXECUTABLE})
 set(CMAKE_CXX_LINK_EXECUTABLE ${CMAKE_ASM-BGP_LINK_EXECUTABLE})


 CMakeASM-BGPInformation.cmake:

 set(ASM_DIALECT -BGP)
 set(CMAKE_ASM${ASM_DIALECT}_SOURCE_FILE_EXTENSIONS S)
 set(CMAKE_ASM${ASM_DIALECT}_COMPILE_OBJECT 
 CMAKE_ASM${ASM_DIALECT}_COMPILER DEFINES FLAGS -c -o OBJECT 
 SOURCE)
 set(CMAKE_ASM${ASM_DIALECT}_LINK_EXECUTABLE 
 CMAKE_ASM${ASM_DIALECT}_COMPILER FLAGS LINK_FLAGS OBJECTS  -o 
 TARGET LINK_LIBRARIES)
 include(CMakeASMInformation)
 set(ASM_DIALECT)


 CMakeDetermineASM-BGPCompiler.cmake:

 set(ASM_DIALECT -BGP)
 set(CMAKE_ASM${ASM_DIALECT}_COMPILER_INIT ${CMAKE_ASM_COMPILER})
 include(CMakeDetermineASMCompiler)
 set(ASM_DIALECT)


 CMakeTestASM-BGPCompiler.cmake:

 set(ASM_DIALECT -BGP)
 include(CMakeTestASMCompiler)
 set(ASM_DIALECT)


 Hope this helps.

 Regards,
 Marcel Loose.


 On 15/10/14 04:23, George Zagaris wrote:

 Dear all,

  I am working on a project where on certain platforms, namely, on a BG/Q
 or Cray, we have to cross-compile the code, but still, there are parts of
 the code that should only be compiled for the front end, login nodes.

  Typically, we have a toolchain file, which among other things sets:
 - CMAKE_CXX_COMPILER
 - CMAKE_C_COMPILER
 - CMAKE_FORTRAN_COMPILER

  to the respective cross-compilers available on the target platform.

  This compiles everything for the back-end.

  The obvious way to compile front-end tools is to create another
 directory, e.g., front-end-build and run cmake therein to re-configure
 and build with a front-end compiler.

  However, since only a relatively small subset of the files needs to be
 compiled for the front-end, it is desirable to do this within the same
 build, which leads to my question:

  Is it possible to tell CMake to build certain files with a different
 compiler? I know there is a way to set file properties to control the
 compiler flags of certain files. Is there a blessed approach to control
 the compiler for certain files and/or directories (and avoid things like
 set(CMAKE_CXX_COMPILER...) within a CMakeLists file)?

  Thank you very much for all your help.

  Best,
 George






 --

 Powered by www.kitware.com

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

 Kitware offers various services to support the CMake community. For more
 information on each offering, please visit:

 CMake Support: http://cmake.org/cmake/help/support.html
 CMake Consulting: http://cmake.org/cmake/help/consulting.html
 CMake Training Courses: http://cmake.org/cmake/help/training.html

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

 Follow this link to subscribe/unsubscribe:
 http://public.kitware.com/mailman/listinfo/cmake

-- 

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses:

Re: [CMake] INSTALL DIRECTORY patterns highly confusing

2014-10-15 Thread Dan Kegel 
On Wed, Oct 15, 2014 at 6:49 PM, Dan Kegel d...@kegel.com wrote:
 The doc could use some more examples.  I am having a hard
 time figuring out how to install a directory tree but exclude
 files matching .gitignore and Makefile.in.

This turned out to work for me:

install (
  DIRECTORY ${samples_SOURCE_DIR}
  DESTINATION src
  PATTERN *.in EXCLUDE
  PATTERN .gitignore EXCLUDE
)

but lord help me, it took me the longest damn time.
-- 

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake

Re: [CMake] INSTALL DIRECTORY patterns highly confusing

2014-10-15 Thread Dan Kegel 
 This turned out to work for me:

 install (
   DIRECTORY ${samples_SOURCE_DIR}
   DESTINATION src
   PATTERN *.in EXCLUDE
   PATTERN .gitignore EXCLUDE
 )

Here's one of my earlier attempts:

   PATTERN '*.in' EXCLUDE
   PATTERN 'CMakeLists.txt' EXCLUDE

Is it possible that single quotes cause silent failure?  Maybe those
could be flagged as likely errors.
-- 

Powered by www.kitware.com

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

Kitware offers various services to support the CMake community. For more 
information on each offering, please visit:

CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html

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

Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake

[Cmake-commits] CMake branch, next, updated. v3.0.2-2071-gd32c4ee

2014-10-15 Thread Nils Gladitz 
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  d32c4ee7cecd8a27e20e0ebf8c274ce2c1532088 (commit)
   via  cc1139cc304b6bd4c8403d437cf08f73e06e243a (commit)
   via  1b3495d32e1523648da08e138482a654f8765333 (commit)
  from  236ff08cb78fd3da9bc0a8bab6cfb2c7a43a79d3 (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=d32c4ee7cecd8a27e20e0ebf8c274ce2c1532088
commit d32c4ee7cecd8a27e20e0ebf8c274ce2c1532088
Merge: 236ff08 cc1139c
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Wed Oct 15 08:55:42 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Oct 15 08:55:42 2014 -0400

Merge topic 'remove-redundant-c_str' into next

cc1139cc strings: Remove redundant calls to std::string::c_str()
1b3495d3 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cc1139cc304b6bd4c8403d437cf08f73e06e243a
commit cc1139cc304b6bd4c8403d437cf08f73e06e243a
Author: Nils Gladitz nilsglad...@gmail.com
AuthorDate: Wed Oct 15 14:54:05 2014 +0200
Commit: Nils Gladitz nilsglad...@gmail.com
CommitDate: Wed Oct 15 14:54:05 2014 +0200

strings: Remove redundant calls to std::string::c_str()

Replacements were detected and performed by the clang tool
remove-cstr-calls on a linux build.

diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx 
b/Source/CPack/cmCPackArchiveGenerator.cxx
index 6e7b8d7..e2437b5 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -56,7 +56,7 @@ int 
cmCPackArchiveGenerator::addOneComponentToArchive(cmArchiveWrite archive,
   localToplevel += /+ component-Name;
   std::string dir = cmSystemTools::GetCurrentWorkingDirectory();
   // Change to local toplevel
-  cmSystemTools::ChangeDirectory(localToplevel.c_str());
+  cmSystemTools::ChangeDirectory(localToplevel);
   std::string filePrefix;
   if (this-IsOn(CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY))
 {
@@ -80,7 +80,7 @@ int 
cmCPackArchiveGenerator::addOneComponentToArchive(cmArchiveWrite archive,
   }
 }
   // Go back to previous dir
-  cmSystemTools::ChangeDirectory(dir.c_str());
+  cmSystemTools::ChangeDirectory(dir);
   return 1;
 }
 
@@ -270,7 +270,7 @@ int cmCPackArchiveGenerator::PackageFiles()
   DECLARE_AND_OPEN_ARCHIVE(packageFileNames[0],archive);
   std::vectorstd::string::const_iterator fileIt;
   std::string dir = cmSystemTools::GetCurrentWorkingDirectory();
-  cmSystemTools::ChangeDirectory(toplevel.c_str());
+  cmSystemTools::ChangeDirectory(toplevel);
   for ( fileIt = files.begin(); fileIt != files.end(); ++ fileIt )
 {
 // Get the relative path to the file
@@ -288,7 +288,7 @@ int cmCPackArchiveGenerator::PackageFiles()
   return 0;
   }
 }
-  cmSystemTools::ChangeDirectory(dir.c_str());
+  cmSystemTools::ChangeDirectory(dir);
   // The destructor of cmArchiveWrite will close and finish the write
   return 1;
 }
diff --git a/Source/CPack/cmCPackDebGenerator.cxx 
b/Source/CPack/cmCPackDebGenerator.cxx
index 936942b..c939cd2 100644
--- a/Source/CPack/cmCPackDebGenerator.cxx
+++ b/Source/CPack/cmCPackDebGenerator.cxx
@@ -58,7 +58,7 @@ int cmCPackDebGenerator::PackageOnePack(std::string 
initialTopLevel,
   // Begin the archive for this pack
   std::string localToplevel(initialTopLevel);
   std::string packageFileName(
-  cmSystemTools::GetParentDirectory(toplevel.c_str())
+  cmSystemTools::GetParentDirectory(toplevel)
   );
   std::string outputFileName(
   std::string(this-GetOption(CPACK_PACKAGE_FILE_NAME))
@@ -186,7 +186,7 @@ int cmCPackDebGenerator::PackageComponentsAllInOne()
   // The ALL GROUPS in ONE package case
   std::string localToplevel(initialTopLevel);
   std::string packageFileName(
-  cmSystemTools::GetParentDirectory(toplevel.c_str())
+  cmSystemTools::GetParentDirectory(toplevel)
  );
   std::string outputFileName(
 std::string(this-GetOption(CPACK_PACKAGE_FILE_NAME))
@@ -540,7 +540,7 @@ int cmCPackDebGenerator::createDeb()
   localcopy += filenamename;
   // if we can copy the file, it means it does exist, let's add it:
   if( cmsys::SystemTools::CopyFileIfDifferent(
-i-c_str(), localcopy.c_str()) )
+*i, localcopy) )
 {
 // debian is picky and need relative to ./ path in the tar.*
 cmd +=  ./;
diff --git a/Source/CPack/cmCPackGenerator.cxx 
b/Source/CPack/cmCPackGenerator.cxx
index 1461bb1..31f0b59 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -399,7 +399,7 @@ int

[Cmake-commits] CMake branch, next, updated. v3.0.2-2073-gf0040c0

2014-10-15 Thread Joe Snyder 
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  f0040c0691a6f7ae4a15d434ca67caf53d21b9ea (commit)
   via  876a84d245efb41a2bbe49e4049da5c2a4c1d660 (commit)
  from  d32c4ee7cecd8a27e20e0ebf8c274ce2c1532088 (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=f0040c0691a6f7ae4a15d434ca67caf53d21b9ea
commit f0040c0691a6f7ae4a15d434ca67caf53d21b9ea
Merge: d32c4ee 876a84d
Author: Joe Snyder joe.sny...@kitware.com
AuthorDate: Wed Oct 15 10:58:32 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Oct 15 10:58:32 2014 -0400

Merge topic 'add_delphi_coverage' into next

876a84d2 CTest: Break up long line.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=876a84d245efb41a2bbe49e4049da5c2a4c1d660
commit 876a84d245efb41a2bbe49e4049da5c2a4c1d660
Author: Joseph Snyder joe.sny...@kitware.com
AuthorDate: Wed Oct 15 10:56:56 2014 -0400
Commit: Joseph Snyder joe.sny...@kitware.com
CommitDate: Wed Oct 15 10:56:56 2014 -0400

CTest: Break up long line.

A line in the cmParseDelphiCoverage.cxx file was too long for the KWStyle.

Break up the line to fall within limits.

diff --git a/Source/CTest/cmParseDelphiCoverage.cxx 
b/Source/CTest/cmParseDelphiCoverage.cxx
index 2bb9988..277c270 100644
--- a/Source/CTest/cmParseDelphiCoverage.cxx
+++ b/Source/CTest/cmParseDelphiCoverage.cxx
@@ -206,7 +206,8 @@ class cmParseDelphiCoverage::HTMLParser
  if(lineresult == covered)
  {
afterLineNum = line.find('',endcovpos+5);
-   filelineoffset= 
line.substr(endcovpos+5,afterLineNum-(endcovpos+5));
+   filelineoffset= line.substr(endcovpos+5,
+ afterLineNum-(endcovpos+5));
coverageVector[atoi(filelineoffset.c_str())-1] = 1;
  }
   }
@@ -255,4 +256,4 @@ bool cmParseDelphiCoverage::ReadDelphiHTML(const char* file)
 parser(this-CTest, this-Coverage);
   parser.ParseFile(file);
   return true;
-};
\ No newline at end of file
+};

---

Summary of changes:
 Source/CTest/cmParseDelphiCoverage.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)


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

[Cmake-commits] CMake branch, next, updated. v3.0.2-2075-g5ed2c9a

2014-10-15 Thread Stephen Kelly 
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  5ed2c9a236fac1ea9ce747ff0b661e810cfe2ff1 (commit)
   via  40dc076bdf6ce81580ecaf3aff25db4b7a8a5dcf (commit)
  from  f0040c0691a6f7ae4a15d434ca67caf53d21b9ea (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=5ed2c9a236fac1ea9ce747ff0b661e810cfe2ff1
commit 5ed2c9a236fac1ea9ce747ff0b661e810cfe2ff1
Merge: f0040c0 40dc076
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Oct 15 13:17:43 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Oct 15 13:17:43 2014 -0400

Merge topic 'remove-borland-build' into next

40dc076b Remove borland workarounds.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=40dc076bdf6ce81580ecaf3aff25db4b7a8a5dcf
commit 40dc076bdf6ce81580ecaf3aff25db4b7a8a5dcf
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Oct 15 09:34:08 2014 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Oct 15 09:46:05 2014 +0200

Remove borland workarounds.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71850de..dfef067 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,7 +115,7 @@ endmacro()
 
 if(NOT CMake_TEST_EXTERNAL_CMAKE)
   set(CMAKE_BUILD_ON_VISUAL_STUDIO 0)
-  if(WIN32 AND NOT UNIX AND NOT BORLAND AND NOT MINGW )
+  if(WIN32 AND NOT UNIX AND NOT MINGW)
 set(CMAKE_BUILD_ON_VISUAL_STUDIO 1)
   endif()
 endif()
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index f9405b3..ad1f8bc 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -473,7 +473,7 @@ set(SRCS ${SRCS}
   cmNinjaUtilityTargetGenerator.cxx
   cmNinjaUtilityTargetGenerator.h
   )
-if(WIN32 AND NOT CYGWIN AND NOT BORLAND)
+if(WIN32 AND NOT CYGWIN)
   set_source_files_properties(cmcldeps.cxx PROPERTIES COMPILE_DEFINITIONS 
_WIN32_WINNT=0x0501)
   add_executable(cmcldeps cmcldeps.cxx)
   target_link_libraries(cmcldeps CMakeLib)
diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx 
b/Source/CPack/cmCPackGeneratorFactory.cxx
index c8737f4..94ca536 100644
--- a/Source/CPack/cmCPackGeneratorFactory.cxx
+++ b/Source/CPack/cmCPackGeneratorFactory.cxx
@@ -47,9 +47,6 @@
 
 #include cmCPackLog.h
 
-#if defined(__BORLANDC__)
-# pragma warn -8008 /* condition is always true */
-#endif
 
 //--
 cmCPackGeneratorFactory::cmCPackGeneratorFactory()
diff --git a/Source/CPack/cmCPackSTGZGenerator.cxx 
b/Source/CPack/cmCPackSTGZGenerator.cxx
index 6c1d201..e5da5cf 100644
--- a/Source/CPack/cmCPackSTGZGenerator.cxx
+++ b/Source/CPack/cmCPackSTGZGenerator.cxx
@@ -71,8 +71,6 @@ int cmCPackSTGZGenerator::PackageFiles()
 retval = cmSystemTools::SetPermissions((*it).c_str(),
 #if defined( _MSC_VER ) || defined( __MINGW32__ )
   S_IREAD | S_IWRITE | S_IEXEC
-#elif defined( __BORLANDC__ )
-  S_IRUSR | S_IWUSR | S_IXUSR
 #else
   S_IRUSR | S_IWUSR | S_IXUSR |
   S_IRGRP | S_IWGRP | S_IXGRP |
diff --git a/Source/CTest/cmCTestBuildHandler.cxx 
b/Source/CTest/cmCTestBuildHandler.cxx
index 2ec1365..cd84082 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -36,9 +36,6 @@
 #include math.h
 #include float.h
 
-#if defined(__BORLANDC__)
-# pragma warn -8060 /* possibly incorrect assignment */
-#endif
 
 static const char* cmCTestErrorMatches[] = {
   ^[Bb]us [Ee]rror,
diff --git a/Source/cmCommandArgumentParser.cxx 
b/Source/cmCommandArgumentParser.cxx
index c5146c5..9f8a4de 100644
--- a/Source/cmCommandArgumentParser.cxx
+++ b/Source/cmCommandArgumentParser.cxx
@@ -183,12 +183,6 @@ static void cmCommandArgumentError(yyscan_t yyscanner, 
const char* message);
 #define YYINITDEPTH 1
 
 /* Disable some warnings in the generated code.  */
-#ifdef __BORLANDC__
-# pragma warn -8004 /* Variable assigned a value that is not used.  */
-# pragma warn -8008 /* condition always returns true */
-# pragma warn -8060 /* possibly incorrect assignment */
-# pragma warn -8066 /* unreachable code */
-#endif
 #ifdef _MSC_VER
 # pragma warning (disable: 4102) /* Unused goto label.  */
 # pragma warning (disable: 4065) /* Switch statement contains default but no
diff --git a/Source/cmCommandArgumentParser.y b/Source/cmCommandArgumentParser.y
index 48f5c8e..b1d53f6 100644
--- a/Source/cmCommandArgumentParser.y
+++ b/Source/cmCommandArgumentParser.y
@@ -64,12 +64,6 @@ static void cmCommandArgumentError(yyscan_t yyscanner, const 
char* message);
 #define YYINITDEPTH 1
 
 /* Disable some warnings in the generated code.  */
-#ifdef __BORLANDC__
-# pragma warn -8004 /* Variable assigned a value

[Cmake-commits] CMake branch, next, updated. v3.0.2-2077-gac8f6bc

2014-10-15 Thread Stephen Kelly 
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  ac8f6bc505a27dc8699068dd8a5cb7dc69a5b93a (commit)
   via  2db55ffa56a69c4b55410afb9b40ab20f4025837 (commit)
  from  5ed2c9a236fac1ea9ce747ff0b661e810cfe2ff1 (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=ac8f6bc505a27dc8699068dd8a5cb7dc69a5b93a
commit ac8f6bc505a27dc8699068dd8a5cb7dc69a5b93a
Merge: 5ed2c9a 2db55ff
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Oct 15 17:17:49 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Oct 15 17:17:49 2014 -0400

Merge topic 'remove-borland-build' into next

2db55ffa Remove borland workarounds.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2db55ffa56a69c4b55410afb9b40ab20f4025837
commit 2db55ffa56a69c4b55410afb9b40ab20f4025837
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Aug 6 15:20:24 2014 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Oct 15 23:16:44 2014 +0200

Remove borland workarounds.

CMake 3.0 is the last release to require to be able to build with
Borland.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 71850de..dfef067 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -115,7 +115,7 @@ endmacro()
 
 if(NOT CMake_TEST_EXTERNAL_CMAKE)
   set(CMAKE_BUILD_ON_VISUAL_STUDIO 0)
-  if(WIN32 AND NOT UNIX AND NOT BORLAND AND NOT MINGW )
+  if(WIN32 AND NOT UNIX AND NOT MINGW)
 set(CMAKE_BUILD_ON_VISUAL_STUDIO 1)
   endif()
 endif()
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index f9405b3..ad1f8bc 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -473,7 +473,7 @@ set(SRCS ${SRCS}
   cmNinjaUtilityTargetGenerator.cxx
   cmNinjaUtilityTargetGenerator.h
   )
-if(WIN32 AND NOT CYGWIN AND NOT BORLAND)
+if(WIN32 AND NOT CYGWIN)
   set_source_files_properties(cmcldeps.cxx PROPERTIES COMPILE_DEFINITIONS 
_WIN32_WINNT=0x0501)
   add_executable(cmcldeps cmcldeps.cxx)
   target_link_libraries(cmcldeps CMakeLib)
diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx 
b/Source/CPack/cmCPackGeneratorFactory.cxx
index c8737f4..94ca536 100644
--- a/Source/CPack/cmCPackGeneratorFactory.cxx
+++ b/Source/CPack/cmCPackGeneratorFactory.cxx
@@ -47,9 +47,6 @@
 
 #include cmCPackLog.h
 
-#if defined(__BORLANDC__)
-# pragma warn -8008 /* condition is always true */
-#endif
 
 //--
 cmCPackGeneratorFactory::cmCPackGeneratorFactory()
diff --git a/Source/CPack/cmCPackSTGZGenerator.cxx 
b/Source/CPack/cmCPackSTGZGenerator.cxx
index 6c1d201..e5da5cf 100644
--- a/Source/CPack/cmCPackSTGZGenerator.cxx
+++ b/Source/CPack/cmCPackSTGZGenerator.cxx
@@ -71,8 +71,6 @@ int cmCPackSTGZGenerator::PackageFiles()
 retval = cmSystemTools::SetPermissions((*it).c_str(),
 #if defined( _MSC_VER ) || defined( __MINGW32__ )
   S_IREAD | S_IWRITE | S_IEXEC
-#elif defined( __BORLANDC__ )
-  S_IRUSR | S_IWUSR | S_IXUSR
 #else
   S_IRUSR | S_IWUSR | S_IXUSR |
   S_IRGRP | S_IWGRP | S_IXGRP |
diff --git a/Source/CTest/cmCTestBuildHandler.cxx 
b/Source/CTest/cmCTestBuildHandler.cxx
index 2ec1365..cd84082 100644
--- a/Source/CTest/cmCTestBuildHandler.cxx
+++ b/Source/CTest/cmCTestBuildHandler.cxx
@@ -36,9 +36,6 @@
 #include math.h
 #include float.h
 
-#if defined(__BORLANDC__)
-# pragma warn -8060 /* possibly incorrect assignment */
-#endif
 
 static const char* cmCTestErrorMatches[] = {
   ^[Bb]us [Ee]rror,
diff --git a/Source/cmCommandArgumentParser.cxx 
b/Source/cmCommandArgumentParser.cxx
index c5146c5..9f8a4de 100644
--- a/Source/cmCommandArgumentParser.cxx
+++ b/Source/cmCommandArgumentParser.cxx
@@ -183,12 +183,6 @@ static void cmCommandArgumentError(yyscan_t yyscanner, 
const char* message);
 #define YYINITDEPTH 1
 
 /* Disable some warnings in the generated code.  */
-#ifdef __BORLANDC__
-# pragma warn -8004 /* Variable assigned a value that is not used.  */
-# pragma warn -8008 /* condition always returns true */
-# pragma warn -8060 /* possibly incorrect assignment */
-# pragma warn -8066 /* unreachable code */
-#endif
 #ifdef _MSC_VER
 # pragma warning (disable: 4102) /* Unused goto label.  */
 # pragma warning (disable: 4065) /* Switch statement contains default but no
diff --git a/Source/cmCommandArgumentParser.y b/Source/cmCommandArgumentParser.y
index 48f5c8e..b1d53f6 100644
--- a/Source/cmCommandArgumentParser.y
+++ b/Source/cmCommandArgumentParser.y
@@ -64,12 +64,6 @@ static void cmCommandArgumentError(yyscan_t yyscanner, const 
char* message);
 #define YYINITDEPTH 1
 
 /* Disable some warnings in the

[Cmake-commits] CMake branch, next, updated. v3.0.2-2079-g9dbd3a4

2014-10-15 Thread Stephen Kelly 
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  9dbd3a493b0161893d04737cc3dad30fb8677ab5 (commit)
   via  522849475e6cac31516e5dd5fa169f2f949a0171 (commit)
  from  ac8f6bc505a27dc8699068dd8a5cb7dc69a5b93a (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=9dbd3a493b0161893d04737cc3dad30fb8677ab5
commit 9dbd3a493b0161893d04737cc3dad30fb8677ab5
Merge: ac8f6bc 5228494
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Oct 15 17:37:11 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Oct 15 17:37:11 2014 -0400

Merge topic 'fix-file-GENERATE-source-files' into next

52284947 file(GENERATE): Evaluate early to allow generating source files


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=522849475e6cac31516e5dd5fa169f2f949a0171
commit 522849475e6cac31516e5dd5fa169f2f949a0171
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Oct 15 23:26:00 2014 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Oct 15 23:34:23 2014 +0200

file(GENERATE): Evaluate early to allow generating source files

The evaluation files must be present before TraceDependencies
attempts to find them.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index ae0e807..7e46f05 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1253,6 +1253,8 @@ void cmGlobalGenerator::Generate()
   // Create per-target generator information.
   this-CreateGeneratorTargets();
 
+  this-ProcessEvaluationFiles();
+
   this-ForceLinkerLanguages();
 
 #ifdef CMAKE_BUILD_WITH_CMAKE
@@ -1276,8 +1278,6 @@ void cmGlobalGenerator::Generate()
 this-LocalGenerators[i]-GenerateTargetManifest();
 }
 
-  this-ProcessEvaluationFiles();
-
   // Compute the inter-target dependencies.
   if(!this-ComputeTargetDepends())
 {
diff --git a/Tests/RunCMake/File_Generate/GenerateSource-result.txt 
b/Tests/RunCMake/File_Generate/GenerateSource-result.txt
new file mode 100644
index 000..573541a
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/GenerateSource-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt 
b/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
new file mode 100644
index 000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/File_Generate/GenerateSource.cmake 
b/Tests/RunCMake/File_Generate/GenerateSource.cmake
new file mode 100644
index 000..8a419ce
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/GenerateSource.cmake
@@ -0,0 +1,14 @@
+
+cmake_minimum_required(VERSION 3.0)
+
+project(cmaketest)
+
+# Ensure re-generation
+file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/main.cpp)
+
+file(GENERATE
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/main.cpp
+  CONTENT int main() { return 0; }\n
+)
+
+add_executable(mn ${CMAKE_CURRENT_BINARY_DIR}/main.cpp)
diff --git a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake 
b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
index dee0692..fb0e917 100644
--- a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
+++ b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
@@ -8,6 +8,7 @@ run_cmake(EmptyCondition1)
 run_cmake(EmptyCondition2)
 run_cmake(BadCondition)
 run_cmake(DebugEvaluate)
+run_cmake(GenerateSource)
 
 set(timeformat %Y%j%H%M%S)
 

---

Summary of changes:
 Source/cmGlobalGenerator.cxx |4 ++--
 .../GenerateSource-result.txt}   |0
 .../GenerateSource-stderr.txt}   |0
 Tests/RunCMake/File_Generate/GenerateSource.cmake|   14 ++
 Tests/RunCMake/File_Generate/RunCMakeTest.cmake  |1 +
 5 files changed, 17 insertions(+), 2 deletions(-)
 copy Tests/RunCMake/{CMP0022/CMP0022-WARN-empty-old-result.txt = 
File_Generate/GenerateSource-result.txt} (100%)
 copy Tests/RunCMake/{CMP0022/CMP0022-NOWARN-exe-stderr.txt = 
File_Generate/GenerateSource-stderr.txt} (100%)
 create mode 100644 Tests/RunCMake/File_Generate/GenerateSource.cmake


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

[Cmake-commits] CMake branch, next, updated. v3.0.2-2081-g05ba09f

2014-10-15 Thread Stephen Kelly 
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  05ba09fc6e695dcbca39289c756f15c7b02f3e5b (commit)
   via  28fedb192175668668e02e0bfd47fde337b83899 (commit)
  from  9dbd3a493b0161893d04737cc3dad30fb8677ab5 (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=05ba09fc6e695dcbca39289c756f15c7b02f3e5b
commit 05ba09fc6e695dcbca39289c756f15c7b02f3e5b
Merge: 9dbd3a4 28fedb1
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Oct 15 17:39:40 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Wed Oct 15 17:39:40 2014 -0400

Merge topic 'fix-file-GENERATE-source-files' into next

28fedb19 file(GENERATE): Evaluate early to allow generating source files


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=28fedb192175668668e02e0bfd47fde337b83899
commit 28fedb192175668668e02e0bfd47fde337b83899
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Oct 15 23:26:00 2014 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Wed Oct 15 23:39:18 2014 +0200

file(GENERATE): Evaluate early to allow generating source files

The evaluation files must be present before TraceDependencies
attempts to find them.

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index ae0e807..7e46f05 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1253,6 +1253,8 @@ void cmGlobalGenerator::Generate()
   // Create per-target generator information.
   this-CreateGeneratorTargets();
 
+  this-ProcessEvaluationFiles();
+
   this-ForceLinkerLanguages();
 
 #ifdef CMAKE_BUILD_WITH_CMAKE
@@ -1276,8 +1278,6 @@ void cmGlobalGenerator::Generate()
 this-LocalGenerators[i]-GenerateTargetManifest();
 }
 
-  this-ProcessEvaluationFiles();
-
   // Compute the inter-target dependencies.
   if(!this-ComputeTargetDepends())
 {
diff --git a/Tests/RunCMake/File_Generate/GenerateSource-result.txt 
b/Tests/RunCMake/File_Generate/GenerateSource-result.txt
new file mode 100644
index 000..573541a
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/GenerateSource-result.txt
@@ -0,0 +1 @@
+0
diff --git a/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt 
b/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
new file mode 100644
index 000..10f3293
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/GenerateSource-stderr.txt
@@ -0,0 +1 @@
+^$
diff --git a/Tests/RunCMake/File_Generate/GenerateSource.cmake 
b/Tests/RunCMake/File_Generate/GenerateSource.cmake
new file mode 100644
index 000..8a419ce
--- /dev/null
+++ b/Tests/RunCMake/File_Generate/GenerateSource.cmake
@@ -0,0 +1,14 @@
+
+cmake_minimum_required(VERSION 3.0)
+
+project(cmaketest)
+
+# Ensure re-generation
+file(REMOVE ${CMAKE_CURRENT_BINARY_DIR}/main.cpp)
+
+file(GENERATE
+  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/main.cpp
+  CONTENT int main() { return 0; }\n
+)
+
+add_executable(mn ${CMAKE_CURRENT_BINARY_DIR}/main.cpp)
diff --git a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake 
b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
index dee0692..fb0e917 100644
--- a/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
+++ b/Tests/RunCMake/File_Generate/RunCMakeTest.cmake
@@ -8,6 +8,7 @@ run_cmake(EmptyCondition1)
 run_cmake(EmptyCondition2)
 run_cmake(BadCondition)
 run_cmake(DebugEvaluate)
+run_cmake(GenerateSource)
 
 set(timeformat %Y%j%H%M%S)
 

---

Summary of changes:


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

[Cmake-commits] CMake branch, master, updated. v3.0.2-2056-g1d86036

2014-10-15 Thread Kitware 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  1d86036df86c3b2584b7d70ae83c14a34be113cc (commit)
  from  1b3495d32e1523648da08e138482a654f8765333 (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=1d86036df86c3b2584b7d70ae83c14a34be113cc
commit 1d86036df86c3b2584b7d70ae83c14a34be113cc
Author: Kitware Robot kwro...@kitware.com
AuthorDate: Thu Oct 16 00:01:12 2014 -0400
Commit: Kitware Robot kwro...@kitware.com
CommitDate: Thu Oct 16 00:01:12 2014 -0400

CMake Nightly Date Stamp

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index e9f339a..f6fd36c 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 1)
-set(CMake_VERSION_PATCH 20141015)
+set(CMake_VERSION_PATCH 20141016)
 #set(CMake_VERSION_RC 1)

---

Summary of changes:
 Source/CMakeVersion.cmake |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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