Re: [cmake-developers] Patch: Detect Fujitsu compilers
On 08/10/2014 05:13 PM, Erik Lindahl wrote: The attached patch provides detection for the Fujitsu C/C++ compilers Applied, thanks: Add Fujitsu compiler detection http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0578c283 I don't think the version information is very important, but if you would like to extract it from the command line, the binaries provide the output below with the -V flag. klogin9$ fccpx -V fccpx: Fujitsu C/C++ Compiler Driver Version 1.2.0 P-id: L3-07 (Jul 30 2013 08:58:18) K-1.2.0-15 For reference: one may grep for _COMPILER_ID_VENDOR_ in the Modules directory of the CMake source tree to see logic that could be used/adapted to extract the version from this output. -Brad -- 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] [update]: CPack IFW generator
On 08/06/2014 01:33 PM, Brad King wrote: CPackIFW: Refactor and revise this generator http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=194b412b After some fixes for nightly testing this is now in 'master' as: CPackIFW: Refactor and revise this generator http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ebe8d51b FYI, if you were to start a new branch and base your changes off the upstream version instead of merging it then I would not have to keep squashing away your history as much. Something like this: git checkout -b cpack-ifw-updates 2fdd5d88 Thanks, -Brad -- 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] [patch] fix Info.plist parser
On 08/07/2014 02:59 PM, Tim Blechmann wrote: Once it works there I will consider backporting it to 3.0. great! thanks a lot! Backported here: BundleUtilities: Allow Info.plist files which use CR line endings http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=00ad505b -Brad -- 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] Patch: Detect Fujitsu compilers
On 8/11/2014 10:39 AM, Brad King wrote: The attached patch provides detection for the Fujitsu C/C++ compilers Can you run a dashboard for this compilers? It would be good to make sure it keeps working in the future. http://www.cmake.org/Wiki/CMake/Git/Dashboard Thanks. -Bill -- 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] Patch: Detect Fujitsu compilers
Hi Bill, Would have loved to, but unfortunately we can't even test our own code (Gromacs) automatically on K. Still, we do test things every few months, so we'll contribute new patches if we find anything that breaks. ... and I just realized I have a patch for the openMP flag too that I'll post later today. Cheers, Erik Erik Lindahl erik.lind...@scilifelab.se Professor of Biophysics Science for Life Laboratory Stockholm University KTH Office (SciLifeLab): +46 8 524 81567 Cell (Sweden): +46 73 4618050 Cell (US): +1 267 3078746 On 11 aug 2014, at 17:13, Bill Hoffman bill.hoff...@kitware.com wrote: On 8/11/2014 10:39 AM, Brad King wrote: The attached patch provides detection for the Fujitsu C/C++ compilers Can you run a dashboard for this compilers? It would be good to make sure it keeps working in the future. http://www.cmake.org/Wiki/CMake/Git/Dashboard Thanks. -Bill -- 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 -- 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] [patch] fix Info.plist parser
On Thu, Aug 07, 2014 at 19:36:54 +0200, Tim Blechmann wrote:
diff --git a/Modules/BundleUtilities.cmake b/Modules/BundleUtilities.cmake
index b896de2..60d01b5 100644
--- a/Modules/BundleUtilities.cmake
+++ b/Modules/BundleUtilities.cmake
@@ -237,6 +237,7 @@ function(get_bundle_main_executable bundle result_var)
file(READ ${bundle}/Contents/Info.plist info_plist)
string(REGEX REPLACE ; ; info_plist ${info_plist})
string(REGEX REPLACE \n ${eol_char}; info_plist ${info_plist})
+string(REGEX REPLACE \r ${eol_char}; info_plist ${info_plist})
Do these need to be REGEX REPLACE? Any problem with straight REPLACE?
--Ben
--
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] [patch] fix Info.plist parser
On 08/11/2014 12:54 PM, Ben Boeckel wrote:
+string(REGEX REPLACE \r ${eol_char}; info_plist ${info_plist})
Do these need to be REGEX REPLACE? Any problem with straight REPLACE?
There are two versions of the commit. One on master that uses
straight REPLACE, and one backported to release that uses the above.
-Brad
--
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] Setting variables in included cmake module files
I have a listfile CMakeLists.txt which includes two cmake modules - vardefs.cmake and unix.cmake, both of which are included by the list file from some path set using CMAKE_MODULE_PATH. I set some variables in vardefs.cmake which I am trying to use in the list file and in unix.cmake. Looks like it is not available in unix.cmake. Is there a way to fix this? Thanks, Arindam -- 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] Why there is not MSI installer for CMake?
It is well known that msi installers are more preferable way of distributing apps on Windows than exe installers. For example msi packages can be installed silently from command line. So why there is no msi package for cmake? Regards, Alexey -- 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] Why there is not MSI installer for CMake?
2014-08-11 18:45 GMT+04:00 Alexey Petruchik alexey.petruc...@gmail.com: It is well known that msi installers are more preferable way of distributing apps on Windows than exe installers. For example msi packages can be installed silently from command line. So why there is no msi package for cmake? Regards, Alexey http://www.cmake.org/cmake/help/v3.0/module/CPackWIX.html -- 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 -- Best Regards, Sergei Nikulov -- 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] Why there is not MSI installer for CMake?
If silently installing is your objective, you may do so with an NSIS built *.exe installer. See this old blog post for details: http://www.kitware.com/blog/home/post/186 HTH, David C. -- 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] How to deal with incompatible changes in interface of target_link_libraries()?
On 08/09/2014 09:46 AM, Marcel Loose wrote: CMake 2.8.12 introduced the keywords PRIVATE, INTERFACE and PUBLIC, and immediately deprecated the LINK_INTERFACE_LIBRARIES keyword, triggering policy warnings CMP0022 and CMP0023. What is the proper way to get rid of these policy warnings, while at the same time staying backward compatible with older CMake versions? From the documentation of CMP0022: Warning-free future-compatible code which works with CMake 2.8.9 onwards can be written by using the LINK_PRIVATE and LINK_PUBLIC keywords of target_link_libraries(). Actually it should say 2.8.7, not 2.8.9. CMP0023 docs mention 2.8.7. -Brad -- 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] Help cmake First project
Hi, Angeliki, thanks your comments. I used properties because my old makefile was written to use g++ despite my files have suffix .c. I understood that cmake tried to compile my files using gcc instead of g++. I removed my set compiler flags. Moreover, I have finished to compile all programs of my project using cmake. My newer CMakeLists.txt is below and works fine. Now I will try to compile my project for Visual Studio 10. Any tips for this new work, I am thankful. cmake_minimum_required(VERSION 2.8) # project Information project(2pg_cartesian) set(PROJECT_VERSION 1.0) #Set CXX compiler for all files below set_source_files_properties(include/LoadConfig.h PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/protpred-Gromacs-NSGA2.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/protpred-Gromacs-Dominance.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/protpred-Gromacs-Front.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/protpred-Gromacs-MC_Metropolis.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/protpred-Gromacs-Mono.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/protpred-Gromacs-Random_Algorithm.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/protpred-Gromacs-Sort_Method_Files_by_Front_Dominance.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/LoadConfig.cpp PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/ea_mono.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/topology.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/pdbio.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/protein.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/futil.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/pdbatom.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/messages.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/topologyio.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/topologylib.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/randomlib.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/vector_math.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/string_owner.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/math_owner.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/osutil.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/load_parameters.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/objective.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/aminoacids.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/aminoacids_io.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/populationio.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/rotation.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/solution.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/gromacs_objectives.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/solutionio.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/algorithms.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/ea_nsga2.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/dominance.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/owner_file_analysis.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/mc_metropolis.c PROPERTIES LANGUAGE CXX ) set_source_files_properties(src/random_algorithm.c PROPERTIES LANGUAGE CXX ) # set include include_directories(include) # add libries add_library(2PG_lib STATIC src/LoadConfig.cpp src/ea_mono.c src/topology.c src/pdbio.c src/protein.c src/futil.c src/pdbatom.c src/messages.c src/topologyio.c src/topologylib.c src/randomlib.c src/vector_math.c src/string_owner.c src/math_owner.c src/osutil.c src/load_parameters.c src/objective.c src/aminoacids.c src/aminoacids_io.c src/populationio.c src/rotation.c src/solution.c src/gromacs_objectives.c src/solutionio.c src/algorithms.c src/ea_nsga2.c src/dominance.c src/owner_file_analysis.c src/mc_metropolis.c src/random_algorithm.c ) #end of 2PG_lib # add target add_executable(protpred-Gromacs-NSGA2 src/protpred-Gromacs-NSGA2.c) target_link_libraries(protpred-Gromacs-NSGA2 2PG_lib) add_executable(protpred-Gromacs-Dominance src/protpred-Gromacs-Dominance.c) target_link_libraries(protpred-Gromacs-Dominance 2PG_lib) add_executable(protpred-Gromacs-Front src/protpred-Gromacs-Front.c) target_link_libraries(protpred-Gromacs-Front 2PG_lib) add_executable(protpred-Gromacs-MC_Metropolis src/protpred-Gromacs-MC_Metropolis.c) target_link_libraries(protpred-Gromacs-MC_Metropolis 2PG_lib) add_executable(protpred-Gromacs-Mono src/protpred-Gromacs-Mono.c) target_link_libraries(protpred-Gromacs-Mono 2PG_lib) add_executable(protpred-Gromacs-Random_Algorithm src/protpred-Gromacs-Random_Algorithm.c) target_link_libraries(protpred-Gromacs-Random_Algorithm 2PG_lib)
[CMake] Possible bug in environment variable expansion?
I am trying to build an Open Source project called PCL which uses Boost, and CMake's ability to find the Boost libraries seems dependent on whether the BOOST_LIBRARYDIR contains a literal path string, or whether it contains a string that incorporates the expansion of BOOST_ROOT. Here are the details: Boost is installed from a pre-built installer in the folder C:\local\boost_1_55_0. This folder contains, among other things, a subfolder called boost, which contains the headers, and a subfolder called lib64-msvc-12.0, which contains 64-bit libraries built with MS Visual Studio 2013. Ordinarily, CMake would like that folder to be called simply lib, but that's not what the installer created, so I'm trying to override the default with environment variables. I have the following three environment variables defined, all of which are of type Expandable string: BOOST_ROOT=C:\local\boost_1_55_0 BOOST_INCLUDEDIR=%BOOST_ROOT% BOOST_LIBRARYDIR=%BOOST_ROOT%\lib64-msvc-12.0 With these settings, CMake reports an error during the configuration process, as follows: CMake Error at C:/Program Files (x86)/CMake/share/cmake-3.0/Modules/FindBoost.cmake:1179 (message): Unable to find the requested Boost libraries. Boost version: 1.55.0 Boost include path: C:/local/boost_1_55_0 Could not find the following Boost libraries: boost_system boost_filesystem boost_thread boost_date_time boost_iostreams boost_chrono No Boost libraries were found. You may need to set BOOST_LIBRARYDIR to the directory containing Boost libraries or BOOST_ROOT to the location of Boost. Call Stack (most recent call first): cmake/pcl_find_boost.cmake:38 (find_package) CMakeLists.txt:230 (include) But if change the definition of BOOST_LIBRARYDIR by replacing %BOOST_ROOT% with the value assigned to BOOST_ROOT, resulting in this: BOOST_LIBRARYDIR=C:\local\boost_1_55_0\lib64-msvc-12.0 the configuration succeeds. The only difference seems to be whether the C:\local\boost_1_55_0 part of the path is specified explicitly, or obtained implicitly with %BOOST_ROOT%. It would surprise me if this behavior were by design. Does anyone have an explanation for this? Thanks, Chris Christopher R. Volpe, Ph.D. Senior Scientist, Remote Sensing Decision Analytics [Description: Description: cid:image003.png@01CE888B.0167BAD0] NATIONAL SECURITY | INFRASTRUCTURE | ENERGY ENVIRONMENT | HEALTH SOLUTIONS Applied Research Associates, Inc. 8537 Six Forks Road, Suite 600, Raleigh, NC 27615 | T 919.582.3380 | F 919.582.3301 Find Us Online www.ara.comhttp://www.ara.com Facebook: Applied Research Associateshttps://www.facebook.com/#!/AppliedResearchAssociates LinkedIn: Company Pagehttp://www.linkedin.com/company/8853?trk=tyah LinkedIn Grouphttp://www.linkedin.com/groups/ARA-Employees-Group-4854334?trk=myg_ugrp_ovr Twitter: ARA Newshttps://twitter.com/ARA_News_Events YouTube: Applied Research Associateshttp://www.youtube.com/user/AppliedResearch1?feature=mhee -- 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] how to really change CMake linker
Hi, In order to build an application with several HPC performance utilities, it would be good to be able to specify the linker and have it show up on the link command line. I learned from http://cmake.3232098.n2.nabble.com/Specify-the-link-command-in-CMake-td6786695.html that using CMAKE_C_LINKER_EXECUTABLE and CMAKE_CXX_LINKER_EXECUTABLE is not the right approach, because you have to specify the entire link line, not just the linker. cmake -DCMAKE_LINKER=/path/to/my/linker seems like it should be the right way to do this, yet the C++ compiler ends up on the link line, not the linker I specified (which has a different name, of course). http://stackoverflow.com/questions/1867745/cmake-use-a-custom-linker is having the same experience. How should this be accomplished reliably? Thanks! Mark -- 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] Cmake issue regarding conversion of existing Visual Studio .targets files to cmake
Hi David,
Executing the batch file from cmake function add_custom_command() in the
COMMAND option is successful.
But is there any mechanism in cmake in which we can specify the user-built
executables OR project-specific executables directly from cmake function
add_custom_command() in the COMMAND option ?
Like, for example, if we want to execute something like this in cmake:
add_custom_command(
TARGET ${TARGETNAME}
POST_BUILD
COMMAND ${VERBIN}/TestVersion.exe \$(VersionPath)\
COMMENT Check if $(VersionPath) has version information...)
Note that here ${VERBIN}/TestVersion.exe is a project specific executable.
When we execute this in cmake, we get the following error:
'TestVer\TestVersion.exe' is not recognized as an internal or external
command,operable program or batch file.
So, please let us know if there is any way other than batch file for this ?
Thanks Regards
Ravi Raman
Xoriant Solutions Pvt. Ltd
4th Floor, Winchester, Hiranandani Business Park, Powai, Mumbai 400076, INDIA.
Tel: +91 22 30511000,9930100026 Extn: 2144 Voip No. 4088344495/96/97/98 Voip
Extn:1178| Fax: +91 22 3051
ravi.ra...@xoriant.com| http://www.xoriant.com
-Original Message-
From: Ravi Raman
Sent: Friday, August 01, 2014 8:01 PM
To: 'David Cole'
Cc: cmake@cmake.org
Subject: RE: [CMake] Cmake issue regarding conversion of existing Visual Studio
.targets files to cmake
Hi David,
Thanks. The 2nd approach of using batch file worked successfully.
Thanks Regards
Ravi Raman
Xoriant Solutions Pvt. Ltd
4th Floor, Winchester, Hiranandani Business Park, Powai, Mumbai 400076, INDIA.
Tel: +91 22 30511000,9930100026 Extn: 2144 Voip No. 4088344495/96/97/98 Voip
Extn:1178| Fax: +91 22 3051
ravi.ra...@xoriant.com| http://www.xoriant.com
-Original Message-
From: David Cole [mailto:dlrd...@aol.com]
Sent: Friday, August 01, 2014 5:41 PM
To: Ravi Raman
Cc: cmake@cmake.org
Subject: Re: [CMake] Cmake issue regarding conversion of existing Visual Studio
.targets files to cmake
Sorry about the premature send on that last email...
First try this:
add_custom_command(
TARGET ${TARGETNAME}
POST_BUILD
COMMAND ${TBIN}/VerCheck.exe \$(TargetPath)\
COMMAND copy \$(TargetPath)\
\$(TargetPath).vercheck_dummy_target\
COMMENT Checking if $(TargetPath) has version info...)
i.e. -- just say POST_BUILD once, then a sequence of COMMAND lines.
(I think it's passing your second POST_BUILD as an argument to
VerCheck...)
If that still doesn't work, try:
add_custom_command(
TARGET ${TARGETNAME}
POST_BUILD
COMMAND VerCheckAndCopy.bat ${TBIN} $(TargetPath)
COMMENT Checking if $(TargetPath) has version info...)
and delegate it to a batch script that takes arguments which internally
does the sequence of commands you want. If you go this route, you may
still need nested quotes around $(TargetPath) -- CMake doesn't know
about expanding those VS values, and whether or not they'll need quotes
around them.
HTH,
David C.
--
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.1-4826-gf34ca49
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 f34ca490e3704aaa7712930cbdff102bd5aa1ecf (commit)
via e3007c92e04416d7fba2db5de757c27d22d4af6b (commit)
via d057bf85a6412bf79a1730b31338c4581e7940be (commit)
via f3dd116cee96d37e039864a032886c73f05c1cda (commit)
from fa20d537ee6957e8bc5ff9be4fbb45db50cf8dde (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=f34ca490e3704aaa7712930cbdff102bd5aa1ecf
commit f34ca490e3704aaa7712930cbdff102bd5aa1ecf
Merge: fa20d53 e3007c9
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Aug 11 09:37:39 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 11 09:37:39 2014 -0400
Merge topic 'CMakePackageConfigHelpers-INSTALL_PREFIX' into next
e3007c92 CMakePackageConfigHelpers: Add unit tests for INSTALL_PREFIX option
d057bf85 CMakePackageConfigHelpers: Add INSTALL_PREFIX option
f3dd116c CMakePackageConfigHelpers: restructure documentation and document
commands
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3007c92e04416d7fba2db5de757c27d22d4af6b
commit e3007c92e04416d7fba2db5de757c27d22d4af6b
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Tue Jul 15 19:51:16 2014 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Aug 11 09:38:29 2014 -0400
CMakePackageConfigHelpers: Add unit tests for INSTALL_PREFIX option
diff --git a/Tests/FindPackageTest/CMakeLists.txt
b/Tests/FindPackageTest/CMakeLists.txt
index 092bf20..f311fb9 100644
--- a/Tests/FindPackageTest/CMakeLists.txt
+++ b/Tests/FindPackageTest/CMakeLists.txt
@@ -374,6 +374,7 @@ endif()
include(CMakePackageConfigHelpers)
+# Generate a config file ready to be installed.
set(INCLUDE_INSTALL_DIR include )
set(SHARE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/share/ )
set(CURRENT_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR} )
@@ -407,6 +408,43 @@ if(Relocatable_FOUND)
message(SEND_ERROR Relocatable_FOUND set to TRUE !)
endif()
+# Generate a config file for the build tree.
+set(INCLUDE_INSTALL_DIR include )
+set(SHARE_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/share/ )
+set(CURRENT_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR} )
+
+configure_package_config_file(RelocatableConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/RelocatableConfig.cmake
+ INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+ PATH_VARS INCLUDE_INSTALL_DIR SHARE_INSTALL_DIR
CURRENT_BUILD_DIR
+ INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}
+ )
+
+set(Relocatable_FIND_COMPONENTS AComp BComp CComp)
+set(Relocatable_FIND_REQUIRED_BComp 1)
+include(${CMAKE_CURRENT_BINARY_DIR}/RelocatableConfig.cmake)
+
+if(NOT ${RELOC_INCLUDE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR}/include)
+ message(SEND_ERROR RELOC_INCLUDE_DIR set by configure_package_config_file()
is set to \${RELOC_INCLUDE_DIR}\ (expected
\${CMAKE_CURRENT_BINARY_DIR}/include\))
+endif()
+
+if(NOT ${RELOC_SHARE_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR}/share/)
+ message(SEND_ERROR RELOC_SHARE_DIR set by configure_package_config_file()
is set to \${RELOC_SHARE_DIR}\ (expected
\${CMAKE_CURRENT_BINARY_DIR}/share/\))
+endif()
+
+if(NOT ${RELOC_BUILD_DIR} STREQUAL ${CMAKE_CURRENT_BINARY_DIR})
+ message(SEND_ERROR RELOC_BUILD_DIR set by configure_package_config_file()
is set to \${RELOC_BUILD_DIR}\ (expected \${CMAKE_CURRENT_BINARY_DIR}\))
+endif()
+
+if(NOT DEFINED Relocatable_FOUND)
+ message(SEND_ERROR Relocatable_FOUND not defined !)
+endif()
+
+if(Relocatable_FOUND)
+ message(SEND_ERROR Relocatable_FOUND set to TRUE !)
+endif()
+
+
+
#-
# Test write_basic_config_version_file().
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d057bf85a6412bf79a1730b31338c4581e7940be
commit d057bf85a6412bf79a1730b31338c4581e7940be
Author: Daniele E. Domenichelli daniele.domeniche...@iit.it
AuthorDate: Tue Jul 15 19:10:54 2014 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Aug 11 09:38:29 2014 -0400
CMakePackageConfigHelpers: Add INSTALL_PREFIX option
This option instructs configure_package_config_file to consider paths
that are not absolute as relative to the INSTALL_PREFIX directory
instead of relative to the CMAKE_INSTALL_PREFIX directory.
If this argument is not passed, the default behaviour is to use
the CMAKE_INSTALL_PREFIX variable.
The new signature is therefore:
configure_package_config_file(input output INSTALL_DESTINATION
[Cmake-commits] CMake branch, next, updated. v3.0.1-4828-g0c01a84
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 0c01a84d75ef20ad6509b70c84e5217c872573b1 (commit)
via ebe8d51b11a2633857317aa1c8fe7ec0527c37eb (commit)
from f34ca490e3704aaa7712930cbdff102bd5aa1ecf (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=0c01a84d75ef20ad6509b70c84e5217c872573b1
commit 0c01a84d75ef20ad6509b70c84e5217c872573b1
Merge: f34ca49 ebe8d51
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Aug 11 09:39:49 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 11 09:39:49 2014 -0400
Merge topic 'cpack-ifw-generator' into next
ebe8d51b CPackIFW: Refactor and revise this generator
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ebe8d51b11a2633857317aa1c8fe7ec0527c37eb
commit ebe8d51b11a2633857317aa1c8fe7ec0527c37eb
Author: Konstantin Podsvirov konstan...@podsvirov.pro
AuthorDate: Wed Aug 6 11:23:00 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Aug 11 09:40:28 2014 -0400
CPackIFW: Refactor and revise this generator
Split the monolithic cmCPackIFWGenerator source into three parts:
cmCPackIFWGenerator, cmCPackIFWInstaller, and cmCPackIFWPackage
to isolate the implementations somewhat.
Add a COMMON option to the cpack_ifw_configure_component command to make
the data component common to its parent group.
Change the default packaging method to ONE_PACKAGE_PER_COMPONENT.
This is not incompatible because the CPack IFW generator has not
yet been in a release.
diff --git a/Modules/CPackIFW.cmake b/Modules/CPackIFW.cmake
index 1f6de8f..29a0047 100644
--- a/Modules/CPackIFW.cmake
+++ b/Modules/CPackIFW.cmake
@@ -123,6 +123,7 @@
# ::
#
# cpack_ifw_configure_component(compname
+# [COMMON]
# [VERSION version]
# [SCRIPT script]
# [NAME name]
@@ -132,7 +133,11 @@
#
# This command should be called after cpack_add_component command.
#
-# ``VERSION`` is version of component. By default used
:variable:`CPACK_PACKAGE_VERSION`.
+# ``COMMON`` if set, then the component will be packaged and installed as part
+# of a group to which he belongs.
+#
+# ``VERSION`` is version of component.
+# By default used :variable:`CPACK_PACKAGE_VERSION`.
#
# ``SCRIPT`` is relative or absolute path to operations script
# for this component.
@@ -163,7 +168,8 @@
#
# This command should be called after cpack_add_component_group command.
#
-# ``VERSION`` is version of component group. By default used
:variable:`CPACK_PACKAGE_VERSION`.
+# ``VERSION`` is version of component group.
+# By default used :variable:`CPACK_PACKAGE_VERSION`.
#
# ``NAME`` is used to create domain-like identification for this component
group.
# By default used origin component group name.
@@ -346,7 +352,7 @@ macro(cpack_ifw_configure_component compname)
string(TOUPPER ${compname} _CPACK_IFWCOMP_UNAME)
- set(_IFW_OPT)
+ set(_IFW_OPT COMMON)
set(_IFW_ARGS VERSION SCRIPT NAME PRIORITY)
set(_IFW_MULTI_ARGS DEPENDS LICENSES)
cmake_parse_arguments(CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME}
${_IFW_OPT} ${_IFW_ARGS} ${_IFW_MULTI_ARGS} ${ARGN})
@@ -367,6 +373,12 @@ macro(cpack_ifw_configure_component compname)
set(_CPACK_IFWCOMP_STR \n# Configuration for IFW component
\${compname}\\n)
+ foreach(_IFW_ARG_NAME ${_IFW_OPT})
+ cpack_append_option_set_command(
+CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME}_${_IFW_ARG_NAME}
+_CPACK_IFWCOMP_STR)
+ endforeach()
+
foreach(_IFW_ARG_NAME ${_IFW_ARGS})
cpack_append_string_variable_set_command(
CPACK_IFW_COMPONENT_${_CPACK_IFWCOMP_UNAME}_${_IFW_ARG_NAME}
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 7f36bb2..9916648 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -577,7 +577,9 @@ set(CPACK_SRCS
CPack/cmCPackGenerator.cxx
CPack/cmCPackLog.cxx
CPack/cmCPackNSISGenerator.cxx
- CPack/cmCPackIFWGenerator.cxx
+ CPack/IFW/cmCPackIFWPackage.cxx
+ CPack/IFW/cmCPackIFWInstaller.cxx
+ CPack/IFW/cmCPackIFWGenerator.cxx
CPack/cmCPackSTGZGenerator.cxx
CPack/cmCPackTGZGenerator.cxx
CPack/cmCPackTXZGenerator.cxx
diff --git a/Source/CPack/IFW/cmCPackIFWGenerator.cxx
b/Source/CPack/IFW/cmCPackIFWGenerator.cxx
new file mode 100644
index 000..e7c97c6
--- /dev/null
+++ b/Source/CPack/IFW/cmCPackIFWGenerator.cxx
@@ -0,0 +1,538 @@
+/*
+ CMake - Cross Platform Makefile Generator
+ Copyright 2000-2009 Kitware, Inc.,
[Cmake-commits] CMake branch, next, updated. v3.0.1-4830-g7ac5bd6
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 7ac5bd61143da98e376e73dcb7706c67f6737c9b (commit) via 975dc87174294d59f60ffa0e52608f8fbf429737 (commit) from 0c01a84d75ef20ad6509b70c84e5217c872573b1 (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=7ac5bd61143da98e376e73dcb7706c67f6737c9b commit 7ac5bd61143da98e376e73dcb7706c67f6737c9b Merge: 0c01a84 975dc87 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 11 09:45:52 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Aug 11 09:45:52 2014 -0400 Merge topic 'wix-acl' into next 975dc871 Help: Add notes for topic 'wix-acl' http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=975dc87174294d59f60ffa0e52608f8fbf429737 commit 975dc87174294d59f60ffa0e52608f8fbf429737 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 11 09:47:09 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Aug 11 09:47:09 2014 -0400 Help: Add notes for topic 'wix-acl' diff --git a/Help/release/dev/wix-acl.rst b/Help/release/dev/wix-acl.rst new file mode 100644 index 000..bf146d0 --- /dev/null +++ b/Help/release/dev/wix-acl.rst @@ -0,0 +1,6 @@ +wix-acl +--- + +* The :manual:`cpack(1)` ``WiX`` generator learned to support + a :prop_inst:`CPACK_WIX_ACL` installed file property to + specify an Access Control List. --- Summary of changes: Help/release/dev/wix-acl.rst |6 ++ 1 file changed, 6 insertions(+) create mode 100644 Help/release/dev/wix-acl.rst 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.1-4832-g96eba9b
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 96eba9b34bd17e72d478af09b9e5bf5a95b35043 (commit) via 704830ae1f7f6b620f2df00ba168c0f3b060c6e2 (commit) from 7ac5bd61143da98e376e73dcb7706c67f6737c9b (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=96eba9b34bd17e72d478af09b9e5bf5a95b35043 commit 96eba9b34bd17e72d478af09b9e5bf5a95b35043 Merge: 7ac5bd6 704830a Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 11 09:49:37 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Aug 11 09:49:37 2014 -0400 Merge topic 'CMakePackageConfigHelpers-INSTALL_PREFIX' into next 704830ae Help: Add notes for topic 'CMakePackageConfigHelpers-INSTALL_PREFIX' http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=704830ae1f7f6b620f2df00ba168c0f3b060c6e2 commit 704830ae1f7f6b620f2df00ba168c0f3b060c6e2 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 11 09:49:14 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Aug 11 09:49:14 2014 -0400 Help: Add notes for topic 'CMakePackageConfigHelpers-INSTALL_PREFIX' diff --git a/Help/release/dev/CMakePackageConfigHelpers-INSTALL_PREFIX.rst b/Help/release/dev/CMakePackageConfigHelpers-INSTALL_PREFIX.rst new file mode 100644 index 000..da8d7c3 --- /dev/null +++ b/Help/release/dev/CMakePackageConfigHelpers-INSTALL_PREFIX.rst @@ -0,0 +1,7 @@ +CMakePackageConfigHelpers-INSTALL_PREFIX + + +* The :module:`CMakePackageConfigHelpers` module + :command:`configure_package_config_file` command learned a new + ``INSTALL_PREFIX`` option to generate package configuration files + meant for a prefix other than :variable:`CMAKE_INSTALL_PREFIX`. --- Summary of changes: Help/release/dev/CMakePackageConfigHelpers-INSTALL_PREFIX.rst |7 +++ 1 file changed, 7 insertions(+) create mode 100644 Help/release/dev/CMakePackageConfigHelpers-INSTALL_PREFIX.rst 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.1-1641-g348999a
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 348999a125f3cf6936a2d5ab4f276b813443f1be (commit) via 70796ef026e8d10a4e50c8e26472d469a45f7dd5 (commit) from 2fdd5d88a16f816ac5fc0f3ff0d22bf5bbe8a12d (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=348999a125f3cf6936a2d5ab4f276b813443f1be commit 348999a125f3cf6936a2d5ab4f276b813443f1be Merge: 2fdd5d8 70796ef Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 11 09:54:12 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Aug 11 09:54:12 2014 -0400 Merge topic 'fix-CMP0047-IS_GNU-vars' 70796ef0 CMP0047: Fix CMAKE_COMPILER_IS_GNU(CC|CXX) in OLD behavior --- Summary of changes: Source/cmGlobalGenerator.cxx |8 1 file changed, 8 insertions(+) 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.1-1635-g5258405
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 52584050c2bb0d65b60b0164af6a28c2761d1598 (commit) via 704830ae1f7f6b620f2df00ba168c0f3b060c6e2 (commit) via e3007c92e04416d7fba2db5de757c27d22d4af6b (commit) via d057bf85a6412bf79a1730b31338c4581e7940be (commit) via f3dd116cee96d37e039864a032886c73f05c1cda (commit) via 64eca30dc4d584fb6acf8f6486c016eed50eb7ae (commit) from 3b0d634f70db6af5469e83bb7c14f687bfafda74 (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=52584050c2bb0d65b60b0164af6a28c2761d1598 commit 52584050c2bb0d65b60b0164af6a28c2761d1598 Merge: 3b0d634 704830a Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 11 09:54:08 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Aug 11 09:54:08 2014 -0400 Merge topic 'CMakePackageConfigHelpers-INSTALL_PREFIX' 704830ae Help: Add notes for topic 'CMakePackageConfigHelpers-INSTALL_PREFIX' e3007c92 CMakePackageConfigHelpers: Add unit tests for INSTALL_PREFIX option d057bf85 CMakePackageConfigHelpers: Add INSTALL_PREFIX option f3dd116c CMakePackageConfigHelpers: restructure documentation and document commands 64eca30d CMakePackageConfigHelpers: Remove unused variable --- Summary of changes: .../CMakePackageConfigHelpers-INSTALL_PREFIX.rst |7 + Modules/CMakePackageConfigHelpers.cmake| 293 +++- Tests/FindPackageTest/CMakeLists.txt | 38 +++ 3 files changed, 202 insertions(+), 136 deletions(-) create mode 100644 Help/release/dev/CMakePackageConfigHelpers-INSTALL_PREFIX.rst 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.1-1643-gf85dee2
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 f85dee25fbf1c5f4db9ecea5fb47910f38fd1ade (commit) via 810f5ccefc113987fc6f68c073ab9c84fc278b32 (commit) from 348999a125f3cf6936a2d5ab4f276b813443f1be (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=f85dee25fbf1c5f4db9ecea5fb47910f38fd1ade commit f85dee25fbf1c5f4db9ecea5fb47910f38fd1ade Merge: 348999a 810f5cc Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 11 09:54:14 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Aug 11 09:54:14 2014 -0400 Merge topic 'BundleUtilities-os9-newlines' 810f5cce BundleUtilities: Allow Info.plist files which use CR line endings --- Summary of changes: Modules/BundleUtilities.cmake |1 + 1 file changed, 1 insertion(+) 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.1-1649-g401d82b
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 401d82b3db7253d29e51ecc7c7cdbaee70a38166 (commit) via 975dc87174294d59f60ffa0e52608f8fbf429737 (commit) via 12418f5c264ef8e66724cbb19e1304416452c7f8 (commit) from 8b61070748ce7de7c7ad3a21b9fa6b3bc5281e4f (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=401d82b3db7253d29e51ecc7c7cdbaee70a38166 commit 401d82b3db7253d29e51ecc7c7cdbaee70a38166 Merge: 8b61070 975dc87 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 11 09:54:19 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Aug 11 09:54:19 2014 -0400 Merge topic 'wix-acl' 975dc871 Help: Add notes for topic 'wix-acl' 12418f5c CPackWIX: Implement CPACK_WIX_ACL (Access Control List) property --- Summary of changes: Help/manual/cmake-properties.7.rst |1 + Help/prop_inst/CPACK_WIX_ACL.rst| 17 +++ Help/release/dev/wix-acl.rst|6 ++ Source/CMakeLists.txt |5 +- Source/CPack/WiX/cmWIXAccessControlList.cxx | 149 +++ Source/CPack/WiX/cmWIXAccessControlList.h | 46 + Source/CPack/WiX/cmWIXFilesSourceWriter.cxx |7 ++ Source/CPack/WiX/cmWIXSourceWriter.h|5 +- Source/cmInstalledFile.cxx | 11 ++ Source/cmInstalledFile.h|3 + 10 files changed, 246 insertions(+), 4 deletions(-) create mode 100644 Help/prop_inst/CPACK_WIX_ACL.rst create mode 100644 Help/release/dev/wix-acl.rst create mode 100644 Source/CPack/WiX/cmWIXAccessControlList.cxx create mode 100644 Source/CPack/WiX/cmWIXAccessControlList.h 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.1-1646-g8b61070
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 8b61070748ce7de7c7ad3a21b9fa6b3bc5281e4f (commit) via 45ab21ee6ebb2727bfb79548811eaf642a46a691 (commit) via 3c0bb28162e1b2d05e913f874dba23b556109a97 (commit) from f85dee25fbf1c5f4db9ecea5fb47910f38fd1ade (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=8b61070748ce7de7c7ad3a21b9fa6b3bc5281e4f commit 8b61070748ce7de7c7ad3a21b9fa6b3bc5281e4f Merge: f85dee2 45ab21e Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 11 09:54:17 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Aug 11 09:54:17 2014 -0400 Merge topic 'update-kwiml' 45ab21ee Merge branch 'upstream-kwiml' into update-kwiml 3c0bb281 KWIML: Teach ABI.h about OpenRISC 1000 --- Summary of changes: Utilities/KWIML/ABI.h.in |4 1 file changed, 4 insertions(+) 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.1-1639-g2fdd5d8
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 2fdd5d88a16f816ac5fc0f3ff0d22bf5bbe8a12d (commit) via ebe8d51b11a2633857317aa1c8fe7ec0527c37eb (commit) via 82382479f7d43158d12f75c5ee8dda53edacd8c4 (commit) via 3040ab8f557b8d8e0e09f4ff569263d429afdb6d (commit) from 52584050c2bb0d65b60b0164af6a28c2761d1598 (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=2fdd5d88a16f816ac5fc0f3ff0d22bf5bbe8a12d commit 2fdd5d88a16f816ac5fc0f3ff0d22bf5bbe8a12d Merge: 5258405 ebe8d51 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 11 09:54:10 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Aug 11 09:54:10 2014 -0400 Merge topic 'cpack-ifw-generator' ebe8d51b CPackIFW: Refactor and revise this generator 82382479 Doxygen: Add STRIP_FROM_PATH variable to doxyfile.in 3040ab8f Doxygen: Add CPack/IFW subdir to doxyfile.in INPUT section --- Summary of changes: Modules/CPackIFW.cmake | 18 +- Source/CMakeLists.txt|4 +- Source/CPack/IFW/cmCPackIFWGenerator.cxx | 538 ++ Source/CPack/IFW/cmCPackIFWGenerator.h | 137 + Source/CPack/IFW/cmCPackIFWInstaller.cxx | 289 ++ Source/CPack/IFW/cmCPackIFWInstaller.h | 84 +++ Source/CPack/IFW/cmCPackIFWPackage.cxx | 486 Source/CPack/IFW/cmCPackIFWPackage.h | 131 + Source/CPack/cmCPackGeneratorFactory.cxx |2 +- Source/CPack/cmCPackIFWGenerator.cxx | 909 -- Source/CPack/cmCPackIFWGenerator.h | 82 --- Utilities/Doxygen/doxyfile.in|5 + 12 files changed, 1689 insertions(+), 996 deletions(-) create mode 100644 Source/CPack/IFW/cmCPackIFWGenerator.cxx create mode 100644 Source/CPack/IFW/cmCPackIFWGenerator.h create mode 100644 Source/CPack/IFW/cmCPackIFWInstaller.cxx create mode 100644 Source/CPack/IFW/cmCPackIFWInstaller.h create mode 100644 Source/CPack/IFW/cmCPackIFWPackage.cxx create mode 100644 Source/CPack/IFW/cmCPackIFWPackage.h delete mode 100644 Source/CPack/cmCPackIFWGenerator.cxx delete mode 100644 Source/CPack/cmCPackIFWGenerator.h 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.1-4839-g6a10e3c
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 6a10e3ccb60fcb4ed7dd65e39b65f8c98c4c7762 (commit) via 401d82b3db7253d29e51ecc7c7cdbaee70a38166 (commit) via 8b61070748ce7de7c7ad3a21b9fa6b3bc5281e4f (commit) via f85dee25fbf1c5f4db9ecea5fb47910f38fd1ade (commit) via 348999a125f3cf6936a2d5ab4f276b813443f1be (commit) via 2fdd5d88a16f816ac5fc0f3ff0d22bf5bbe8a12d (commit) via 52584050c2bb0d65b60b0164af6a28c2761d1598 (commit) from 96eba9b34bd17e72d478af09b9e5bf5a95b35043 (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=6a10e3ccb60fcb4ed7dd65e39b65f8c98c4c7762 commit 6a10e3ccb60fcb4ed7dd65e39b65f8c98c4c7762 Merge: 96eba9b 401d82b Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 11 09:56:06 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Aug 11 09:56:06 2014 -0400 Merge branch 'master' into next --- 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, release, updated. v3.0.1-7-g81a4ca5
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, release has been updated
via 81a4ca57f858ad8ea7e042f60300aa5322541578 (commit)
via 4988b174923dd20620d1c7ee9feec6d04386cbc4 (commit)
via c6f1c5585aabdd2f670e3fc5390ffef43232456f (commit)
via 00ad505b374f80c72e6576bb0cb3829521964239 (commit)
via 59c3695edd8795b9c3b8eb7cacd3991b6a9860f6 (commit)
via 71a11252e95797113ecb1a969386f496b7d4861b (commit)
via 261acd91093ba5f2bf79f38a9632887ab2dd5f1c (commit)
from 76acc128a272b1fae303215a985410faec87c3e0 (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 -
---
Summary of changes:
Modules/BundleUtilities.cmake |1 +
Source/cmGlobalGenerator.cxx|8
Source/cmQtAutoGenerators.cxx | 13 +
Source/cmQtAutoGenerators.h |2 +-
Tests/QtAutogen/CMakeLists.txt |4 ++--
Tests/QtAutogen/resourcetester.cpp |2 ++
.../{not_generated_file.qrc = second_resource.qrc} |2 +-
Tests/QtAutogen/second_widget.cpp | 14 ++
Tests/QtAutogen/second_widget.h | 19 +++
Tests/QtAutogen/{calwidget.ui = second_widget.ui} |8
10 files changed, 61 insertions(+), 12 deletions(-)
copy Tests/QtAutogen/{not_generated_file.qrc = second_resource.qrc} (71%)
create mode 100644 Tests/QtAutogen/second_widget.cpp
create mode 100644 Tests/QtAutogen/second_widget.h
copy Tests/QtAutogen/{calwidget.ui = second_widget.ui} (84%)
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.1-1655-gffc1935
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 ffc1935a73267cfe74e5d5492c9621ccf6c66112 (commit) via 81a4ca57f858ad8ea7e042f60300aa5322541578 (commit) via 4988b174923dd20620d1c7ee9feec6d04386cbc4 (commit) via c6f1c5585aabdd2f670e3fc5390ffef43232456f (commit) via 00ad505b374f80c72e6576bb0cb3829521964239 (commit) via 59c3695edd8795b9c3b8eb7cacd3991b6a9860f6 (commit) from 401d82b3db7253d29e51ecc7c7cdbaee70a38166 (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 - --- 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, next, updated. v3.0.1-4846-g2e4f89e
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 2e4f89e45d407c33f08a004b6fd083f54f52548b (commit) via ffc1935a73267cfe74e5d5492c9621ccf6c66112 (commit) via 81a4ca57f858ad8ea7e042f60300aa5322541578 (commit) via 4988b174923dd20620d1c7ee9feec6d04386cbc4 (commit) via c6f1c5585aabdd2f670e3fc5390ffef43232456f (commit) via 00ad505b374f80c72e6576bb0cb3829521964239 (commit) via 59c3695edd8795b9c3b8eb7cacd3991b6a9860f6 (commit) from 6a10e3ccb60fcb4ed7dd65e39b65f8c98c4c7762 (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=2e4f89e45d407c33f08a004b6fd083f54f52548b commit 2e4f89e45d407c33f08a004b6fd083f54f52548b Merge: 6a10e3c ffc1935 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 11 10:02:22 2014 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Aug 11 10:02:22 2014 -0400 Merge branch 'master' into next --- 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, next, updated. v3.0.1-4848-g120be8c
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 120be8c8a323841d3d70bb8137d629b60b047cb0 (commit) via 0578c283e88c40957c7f43c653dd8c75d8c7782e (commit) from 2e4f89e45d407c33f08a004b6fd083f54f52548b (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=120be8c8a323841d3d70bb8137d629b60b047cb0 commit 120be8c8a323841d3d70bb8137d629b60b047cb0 Merge: 2e4f89e 0578c28 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Aug 11 10:33:36 2014 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Aug 11 10:33:36 2014 -0400 Merge topic 'fujitsu-compiler-id' into next 0578c283 Add Fujitsu compiler detection http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0578c283e88c40957c7f43c653dd8c75d8c7782e commit 0578c283e88c40957c7f43c653dd8c75d8c7782e Author: Erik Lindahl e...@kth.se AuthorDate: Sun Aug 10 22:55:44 2014 +0200 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Aug 11 10:31:06 2014 -0400 Add Fujitsu compiler detection The Fujitsu C/C++ compilers are the default ones for K computer. Detect both native and cross compilers by looking for the __FUJITSU preprocessor definition. diff --git a/Modules/CMakeCompilerIdDetection.cmake b/Modules/CMakeCompilerIdDetection.cmake index e247885..19bcbcc 100644 --- a/Modules/CMakeCompilerIdDetection.cmake +++ b/Modules/CMakeCompilerIdDetection.cmake @@ -74,6 +74,7 @@ function(compiler_id_detection outvar lang) PGI Cray TI + Fujitsu ) if (lang STREQUAL C) list(APPEND ordered_compilers diff --git a/Modules/Compiler/Fujitsu-DetermineCompiler.cmake b/Modules/Compiler/Fujitsu-DetermineCompiler.cmake new file mode 100644 index 000..73ee38c --- /dev/null +++ b/Modules/Compiler/Fujitsu-DetermineCompiler.cmake @@ -0,0 +1,2 @@ + +set(_compiler_id_pp_test defined(__FUJITSU) || defined(__FCC_VERSION) || defined(__fcc_version)) --- Summary of changes: Modules/CMakeCompilerIdDetection.cmake |1 + Modules/Compiler/Fujitsu-DetermineCompiler.cmake |2 ++ 2 files changed, 3 insertions(+) create mode 100644 Modules/Compiler/Fujitsu-DetermineCompiler.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.1-4850-g9d9cc68
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 9d9cc68308d7d08a3b3df35a2ad17430dd9f2ce9 (commit)
via c5e3c7c3c7fad6e7c6638a768cee3995b0a518a6 (commit)
from 120be8c8a323841d3d70bb8137d629b60b047cb0 (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=9d9cc68308d7d08a3b3df35a2ad17430dd9f2ce9
commit 9d9cc68308d7d08a3b3df35a2ad17430dd9f2ce9
Merge: 120be8c c5e3c7c
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Aug 11 12:59:21 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 11 12:59:21 2014 -0400
Merge topic 'add-CheckFortranSourceCompiles' into next
c5e3c7c3 Add CheckFortranSourceCompiles module (#14656)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5e3c7c3c7fad6e7c6638a768cee3995b0a518a6
commit c5e3c7c3c7fad6e7c6638a768cee3995b0a518a6
Author: Brad King brad.k...@kitware.com
AuthorDate: Wed Aug 6 10:27:17 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Wed Aug 6 10:45:40 2014 -0400
Add CheckFortranSourceCompiles module (#14656)
Copy the CheckCSourceCompiles module and port it to Fortran.
Extend the FortranOnly test to try using the new module.
Suggested-by: Nicolas Bock nicolasb...@gmail.com
diff --git a/Help/manual/cmake-modules.7.rst b/Help/manual/cmake-modules.7.rst
index 91fffe9..c279d50 100644
--- a/Help/manual/cmake-modules.7.rst
+++ b/Help/manual/cmake-modules.7.rst
@@ -23,6 +23,7 @@ All Modules
/module/CheckCXXSourceRuns
/module/CheckCXXSymbolExists
/module/CheckFortranFunctionExists
+ /module/CheckFortranSourceCompiles
/module/CheckFunctionExists
/module/CheckIncludeFileCXX
/module/CheckIncludeFile
diff --git a/Help/module/CheckFortranSourceCompiles.rst
b/Help/module/CheckFortranSourceCompiles.rst
new file mode 100644
index 000..b749a2a
--- /dev/null
+++ b/Help/module/CheckFortranSourceCompiles.rst
@@ -0,0 +1 @@
+.. cmake-module:: ../../Modules/CheckFortranSourceCompiles.cmake
diff --git a/Help/release/dev/add-CheckFortranSourceCompiles.rst
b/Help/release/dev/add-CheckFortranSourceCompiles.rst
new file mode 100644
index 000..b78c747
--- /dev/null
+++ b/Help/release/dev/add-CheckFortranSourceCompiles.rst
@@ -0,0 +1,5 @@
+add-CheckFortranSourceCompiles
+--
+
+* The :module:`CheckFortranSourceCompiles` module was added to
+ provide a ``CHECK_Fortran_SOURCE_COMPILES`` macro.
diff --git a/Modules/CheckFortranSourceCompiles.cmake
b/Modules/CheckFortranSourceCompiles.cmake
new file mode 100644
index 000..63e4539
--- /dev/null
+++ b/Modules/CheckFortranSourceCompiles.cmake
@@ -0,0 +1,110 @@
+#.rst:
+# CheckFortranSourceCompiles
+# --
+#
+# Check if given Fortran source compiles and links into an executable::
+#
+# CHECK_Fortran_SOURCE_COMPILES(code var [FAIL_REGEX fail-regex])
+#
+# The arguments are:
+#
+# ``code``
+# Source code to try to compile. It must define a PROGRAM entry point.
+# ``var``
+# Variable to store whether the source code compiled.
+# ``fail-regex``
+# Fail if test output matches this regex.
+#
+# The following variables may be set before calling this macro to modify
+# the way the check is run::
+#
+# CMAKE_REQUIRED_FLAGS = string of compile command line flags
+# CMAKE_REQUIRED_DEFINITIONS = list of macros to define (-DFOO=bar)
+# CMAKE_REQUIRED_INCLUDES = list of include directories
+# CMAKE_REQUIRED_LIBRARIES = list of libraries to link
+# CMAKE_REQUIRED_QUIET = execute quietly without messages
+
+#=
+# Copyright 2005-2009 Kitware, Inc.
+#
+# Distributed under the OSI-approved BSD License (the License);
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=
+# (To distribute this file outside of CMake, substitute the full
+# License text for the above reference.)
+
+
+
+macro(CHECK_Fortran_SOURCE_COMPILES SOURCE VAR)
+ if(NOT DEFINED ${VAR})
+set(_FAIL_REGEX)
+set(_key)
+foreach(arg ${ARGN})
+ if(${arg} MATCHES ^(FAIL_REGEX)$)
+set(_key ${arg})
+ elseif(_key)
+list(APPEND _${_key} ${arg})
+ else()
+message(FATAL_ERROR Unknown argument:\n ${arg}\n)
+ endif()
+endforeach()
+set(MACRO_CHECK_FUNCTION_DEFINITIONS
+ -D${VAR} ${CMAKE_REQUIRED_FLAGS})
[Cmake-commits] CMake branch, next, updated. v3.0.1-4852-gdcd9e96
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 dcd9e9671e260bf7453bde45cf8205d9808640cb (commit)
via 150c2125ddad4e5e6986dc168ccf3b35625f1cf5 (commit)
from 9d9cc68308d7d08a3b3df35a2ad17430dd9f2ce9 (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=dcd9e9671e260bf7453bde45cf8205d9808640cb
commit dcd9e9671e260bf7453bde45cf8205d9808640cb
Merge: 9d9cc68 150c212
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Aug 11 13:08:00 2014 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Aug 11 13:08:00 2014 -0400
Merge topic 'FindMPI-mpiexec-MPI_HOME' into next
150c2125 FindMPI: Honor MPI_HOME for MPIEXEC (#14347)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=150c2125ddad4e5e6986dc168ccf3b35625f1cf5
commit 150c2125ddad4e5e6986dc168ccf3b35625f1cf5
Author: Marcel Loose lo...@astron.nl
AuthorDate: Mon Aug 11 13:07:20 2014 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Aug 11 13:09:02 2014 -0400
FindMPI: Honor MPI_HOME for MPIEXEC (#14347)
We already use MPI_HOME and ENV{MPI_HOME} as hints for the location
of the MPI compilers. Do the same for mpiexec, and then use the
location of mpiexec as a hint to find the compilers.
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index 6e15f3b..3be5e3c 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -522,6 +522,7 @@ endfunction()
# Most mpi distros have some form of mpiexec which gives us something we can
reliably look for.
find_program(MPIEXEC
NAMES ${_MPI_EXEC_NAMES}
+ HINTS ${MPI_HOME} $ENV{MPI_HOME}
PATHS ${_MPI_PREFIX_PATH}
PATH_SUFFIXES bin
DOC Executable for running MPI programs.)
@@ -584,7 +585,9 @@ foreach (lang C CXX Fortran)
find_program(MPI_${lang}_COMPILER
NAMES ${_MPI_${lang}_COMPILER_NAMES}
- PATHS ${MPI_HOME}/bin $ENV{MPI_HOME}/bin ${_MPI_PREFIX_PATH})
+ HINTS ${_MPI_BASE_DIR}/bin
+ PATHS ${_MPI_PREFIX_PATH}
+ )
interrogate_mpi_compiler(${lang} ${try_libs})
mark_as_advanced(MPI_${lang}_COMPILER)
---
Summary of changes:
Modules/FindMPI.cmake |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
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.1-1656-g9c103ae
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 9c103ae80a15b0eccabec8b74812f0f9e9c17123 (commit) from ffc1935a73267cfe74e5d5492c9621ccf6c66112 (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=9c103ae80a15b0eccabec8b74812f0f9e9c17123 commit 9c103ae80a15b0eccabec8b74812f0f9e9c17123 Author: Kitware Robot kwro...@kitware.com AuthorDate: Tue Aug 12 00:01:14 2014 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Tue Aug 12 00:01:14 2014 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index e685083..dffdbd1 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 0) -set(CMake_VERSION_PATCH 20140811) +set(CMake_VERSION_PATCH 20140812) #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
