[cmake-developers] [CMake 0014499]: Add support for .NET target framework version for VS 2008
The following issue has been SUBMITTED. == http://public.kitware.com/Bug/view.php?id=14499 == Reported By:mar-na Assigned To: == Project:CMake Issue ID: 14499 Category: CMake Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2013-10-21 07:54 EDT Last Modified: 2013-10-21 07:54 EDT == Summary:Add support for .NET target framework version for VS 2008 Description: I want set the .net target framework for a managed C++ project. I use VS 2008 but cmake currently support the target property VS_DOTNET_TARGET_FRAMEWORK_VERSION only for VS 2010. == Issue History Date ModifiedUsername FieldChange == 2013-10-21 07:54 mar-na New Issue == -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] CheckTypeSize: Add support for C++
On 10/21/2013 10:41 AM, Daniele E. Domenichelli wrote: Does it seem ok now? Can I merge to next? Yes, please. Thanks, -Brad -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Ninja: using dependency database
On 21.10.2013 16:19, Bill Hoffman wrote: On 10/19/2013 7:09 AM, Peter Kümmel wrote: CMake now uses Ninja's database feature for dependency tracking. An empty build now takes about a third less (e.g. Clang 160ms-100ms) Therefore ninja master is needed, please update your build server. This looks like a real bug: http://open.cdash.org/testDetails.php?test=214096074build=3067806 When I revert my patch the test still fails, I have to check if why. Run Build Command:/home/kitware/Dashboards/My\ Tests/ninja/ninja [1/8] Building C object /home/kitware/Dashboards/My Tests/CMake-ninja-build/Tests/OutOfBinary/CMakeFiles/outlib.dir/outlib.c.o [2/8] Building CXX object SubDir/OutOfSourceSubdir/CMakeFiles/testlib.dir/testlib.cxx.o FAILED: /usr/bin/cc-MMD -MT /home/kitware/Dashboards/My Tests/CMake-ninja-build/Tests/OutOfBinary/CMakeFiles/outlib.dir/outlib.c.o -MF /home/kitware/Dashboards/My Tests/CMake-ninja-build/Tests/OutOfBinary/CMakeFiles/outlib.dir/outlib.c.o.d -o /home/kitware/Dashboards/My Tests/CMake-ninja-build/Tests/OutOfBinary/CMakeFiles/outlib.dir/outlib.c.o -c /home/kitware/Dashboards/My Tests/NinjaCMake/Tests/OutOfBinary/outlib.c depfile has multiple output paths. ninja: build stopped: subcommand failed. -Bill -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] CTest: Request review of topic ctest-fix-run-serial
On 10/21/2013 2:39 PM, Nils Gladitz wrote: I haven't see that fail on my local test runs. Is it sporadic or does it fail for you consistently? Never mind on this one. Looks like it fails for me without your changes. -Bill -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Patches for Visual Studio multi-CPU architecture project generation and a Windows-Phone-8 generator
Do Windows Store and Desktop apps have different toolsets? If yes it should be enough IMO. On 21.10.2013, at 14:26, Paul Annetts wrote: To differentiate between Windows Store and Windows desktop apps. Paul. From: Patrick Gansterer Sent: 21/10/2013 09:12 To: Paul Annetts Cc: 'Brad King'; cmake-developers@cmake.org Subject: Re: [cmake-developers] Patches for Visual Studio multi-CPU architecture project generation and a Windows-Phone-8 generator On 21.10.2013, at 10:08, Paul Annetts wrote: Patrick's comments about using CMAKE_GENERATOR_TOOLSET have made me think we should have a combined Visual Studio 11 2012 Windows-Store generator using CMAKE_GENERATOR_TOOLSET to switch between Windows Store and Windows Phone. (The Windows Store and Phone C/C++ APIs are very similar, but don't share an ABI). Why do you need the special Windows-Store generator then? -- Patrick -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
Re: [cmake-developers] Perforce Patch for CTest
Attached is the latest version of the Perforce support patch for CTest. I've added a test (CTest.UpdateP4) that launches a Perforce server listening on a custom port and performs the same operations as other VCS tools. Some release notes: - Unix is expected. Windows could work (it's a matter of changing how the Perforce service is started) but I have no Windows machines handy to add support for it. - The Perforce p4 and p4d utilities must be installed. find_program() will be used to locate them - p4d will be started and a new database will be created at the beginning of each test run, so we will always test against a fresh and new repository. - Based on the tests, I modified how the P4 CTest client reports its modified paths, so now relative paths to the root are returned (without the depot name). - As I had a server (p4d) I was able to play succesfully with message localization so now I set the messages language to English before each command is executed, preventing problems with the results parsing if somebody ever configures Perforce in another language. - Fixed little cosmetic things here and there as a result of having it running in house for a couple of weeks. Pedro On Wed, Oct 16, 2013 at 1:10 PM, Brad King brad.k...@kitware.com wrote: On 10/16/2013 03:11 PM, Pedro Navarro wrote: I was thinking that as the test requires the p4 tool to be installed, we might as well require also p4d (the server, which is now free for up to 20 users). In that case the test can bring up a local server and work against it which, in the end, will create less issues as the p4 database will be deleted when the test ends. If we work against a real production server we might not be able to use p4 obliterate and we will be leaving those temporary checkins the test does polluting the history, and that might not be desired. We definitely need the test to run against a fresh repository each time. The other VCS tool tests all create local repos from scratch when they run. Whatever you need to require to achieve this with P4 is acceptable. Thanks, -Brad 0001-Perforce-support-for-CTest.patch Description: Binary data -- Powered by www.kitware.com Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Follow this link to subscribe/unsubscribe: http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-developers
[CMake] CMake 3.0?
Hello, I have seen that CMake 2.8.13 has been removed from the Mantis Roadmap. Instead there is a new 3.0 version Can you tell us more about it? Does that mean that we are to expect great new stuff ? I guess it will break backward compatibility since you change major, what is going to be broken/dropped? Regards, Gregoire -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] cmake-2.8.12: generator expression error when linker flags have comma
Jed Brown wrote:
Stephen Kelly steve...@gmail.com writes:
Jed Brown wrote:
I just upgraded from cmake-2.8.11.2 to 2.8.12 and now get errors when a
comma ',' appears in a linker flag. Test case below. Note that this is
but one of many reasons for a comma to appear in linker flags.
I've pushed a fix candidate:
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3eeb83d147030
Thanks. Did the test case here really reproduce the problem on your
end? Putting essentially that line
target_link_libraries(staticlib1 LINK_PRIVATE
-L${CMAKE_CURRENT_BINARY_DIR} -Wl,--start-group -lstaticlib3
-Wl,--end-group)
in my test case did not trigger the error.
Yes, it produces the problem for me. Please try the unit test, or post a
full example using that line which does not show the problem.
I guess this will be in 2.8.12.1, whenever that is released?
I assume so too.
Remember that the way to avoid bugs like this in the release is to test a
release candidate.
None of my current projects use CMake. I encountered this issue while
updating an interface to someone else's project that uses CMake. I
reduced the test case to rule out the possibility that it was a usage
problem on his part and to make sure it was easy for you to reproduce so
that it could be fixed quickly, but I don't see it as my responsibility
to test release candidates of software that I don't use.
Ok, thanks for reporting!
Steve.
--
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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] How to test for the usability of a target
On Wednesday, 16. October 2013, 19:45:32, Alexander Neundorf wrote:
On Tuesday 15 October 2013, Johannes Zarl wrote:
I'd like to make some code in my build system dependent on the existance
of a target. Basically I'd like to write something like this:
if(TARGET optional_lib)
add_library(bar ${bar_srcs})
target_link_library(bar optional_lib)
endif()
Can generator expressions maybe be used for that ?
They are evaluated at generate time, so at a time when the target is know
to exist or not.
Yes, that should probably work for my use case. I hadn't thought of that.
Thanks!
Johannes
--
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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] How to write a correct wrapper of MESSAGE()?
On Thursday, 17. October 2013, 07:12:51, Clark WANG wrote: When I'm using CMake more and more I find it's not a real serious language. It's so tricky. I can see why you are frustrated. I don't think it's all bad though. Hopefully CMake3 will be used for some language cleanups at the expense of breaking some backwards-compatibility... Johannes -- 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://www.cmake.org/mailman/listinfo/cmake
[CMake] Possible differences in result of list(SORT)
Hi, according to the documentation, list(SORT list) sorts the list in-place alphabetically. Without changing the host system: Does the order depend on any additional input (like settings of environment variables)? For instance the sort tool (on POSIX systems) shows significant dependencies with respect to LANG, LC_COLLATE, ... which can result in different order: E;f;e;F can result in E;F;e;f (i.e. upper case first) when using LANG=C and e;E;f;F when using LANG=en_US.UTF-8. I'm mainly interested in the behavior of CMake 2.8.10.2, but maybe there is a general answer to the question. Kind regards Ingolf -- 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://www.cmake.org/mailman/listinfo/cmake
[CMake] include library directories are wrong
cmake 2.8.12 MacOSX 10.8.5 gcc i686-apple-darwin11-llvm-gcc-4.2 OpenCV 2.4.3 Hi. I am new to cmake. Now I am trying to build a system that requires OpenCV. Source codes are separated into several modules, so cmake can make my life easier. running cmake . in the project directory seems ok, giving, % cmake . -- Configuring done -- Generating done -- Build files have been written to: /Users/soichi/Dropbox/OpenCV/project1 but running make gives % make make[2]: *** No rule to make target `/usr/local/lib/libopencv_calib3d.dylib', needed by `DetectRegions_Desktop'. Stop. make[1]: *** [CMakeFiles/DetectRegions_Desktop.dir/all] Error 2 make: *** [all] Error 2 cmake cannot find libopencv_calib3d.dylib . Of course the problem is the library directory. which is NOT /usr/local/lib/ but IS /Users/soichi/OpenCV-2.4.3/release/lib This should be a basic question but I need to ask. Where do I need to specify the directory of external library? More specifically, it should be something like OpenCV_LIB_DIR =??? -- 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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Possible differences in result of list(SORT)
list(SORT) does an std::sort() of std::strings. I think CMake does not perform any character set conversions so the available strings retain the encoding as used in the input file and std::string ordering is based on byte-wise comparison. Nils On 10/21/2013 12:58 PM, Ingolf Steinbach wrote: Hi, according to the documentation, list(SORT list) sorts the list in-place alphabetically. Without changing the host system: Does the order depend on any additional input (like settings of environment variables)? For instance the sort tool (on POSIX systems) shows significant dependencies with respect to LANG, LC_COLLATE, ... which can result in different order: E;f;e;F can result in E;F;e;f (i.e. upper case first) when using LANG=C and e;E;f;F when using LANG=en_US.UTF-8. I'm mainly interested in the behavior of CMake 2.8.10.2, but maybe there is a general answer to the question. Kind regards Ingolf -- 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://www.cmake.org/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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Debuginfo builds and CPack RPM support
I would like for there to be support for debuginfo builds as well. This is essential in my use case, where I am debugging a huge program on a remote system with limited memory and a relatively slow network link. Having a separate symbol pacakge is the preferred way to debug remotely since symbols can be loaded on the client much faster than they can across a network, and without increasing the memory used on the system under test. Is there a feature open yet to track this request? A quick search of the backlog did not turn up anything. My alternative will be to continue to use my own packaging scripts. Thank you, --Edwin -- View this message in context: http://cmake.3232098.n2.nabble.com/Debuginfo-builds-and-CPack-RPM-support-tp7582538p7585833.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://www.cmake.org/mailman/listinfo/cmake
[CMake] Setting CMAKE_CXX_COMPILER CMAKE_C_COMPILER in CMakeLists.txt
Hi all,
I'm using CMake to try compile a set of C bindings to the FLTK GUI library
and would like to set the C/C++ compiler variables in the build script but
haven't been successful. I realize that setting environment variables is
the recommended method but I've tried to explain why I need it below.
The FLTK library also builds an executable called `fltk-config` that can be
queried for information about the FLTK build. For examples, to find out
what C++ compiler was used to build FLTK I can just do:
fltk-config --cxx
I'd like to use the output of these queries to set the CMAKE_CXX_COMPILER
and CMAKE_C_COMPILER variables.
Here's what I have so far:
find_program(FLTKCONFIG fltk-config)
if(NOT FLTKCONFIG)
message(FATAL_ERROR Cannot find the fltk-config executable. Is FLTK
installed?)
endif(NOT FLTKCONFIG)
execute_process(COMMAND ${FLTKCONFIG} --cxx OUTPUT_VARIABLE
FLTK_CXX_COMPILER_QUERY_RESULT)
execute_process(COMMAND ${FLTKCONFIG} --cc OUTPUT_VARIABLE
FLTK_C_COMPILER_QUERY_RESULT)
message(STATUS Using C compiler (fltk-config -cc):
${FLTK_C_COMPILER_QUERY_RESULT})
message(STATUS Using C++ compiler (fltk-config --cxx):
${FLTK_CXX_COMPILER_QUERY_RESULT})
find_program(CXX_COMPILER ${FLTK_CXX_COMPILER_QUERY_RESULT})
find_program(C_COMPILER ${FLTK_C_COMPILER_QUERY_RESULT})
message(STATUS ${CXX_COMPILER})
message(STATUS ${C_COMPILER})
set(CMAKE_CXX_COMPILER ${CXX_COMPILER})
set(CMAKE_C_COMPILR ${C_COMPILER})
And running this outputs:
-- Using C compiler (fltk-config -cc): gcc
-- Using C++ compiler (fltk-config --cxx): g++
-- CXX_COMPILER-NOTFOUND
-- C_COMPILER-NOTFOUND
-- /usr/local/bin/fltk-config
...
Thanks!
-deech
--
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://www.cmake.org/mailman/listinfo/cmake
[CMake] TARGET.dir variable?
Is there a predefined variable for the TARGET.dir subdirectory of
${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY} ?
I'm rolling my own - easy enough -but wanted to double check I'm not missing an
easier way to do it?
Gerard Weatherby
Appllication Architect
Virtual Cell, Center for Cell Analysis and Modeling (CCAM)
University of Connecticut Health Center
860-679-2065
--
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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] TARGET.dir variable?
On Monday 21 October 2013, Weatherby,Gerard wrote:
Is there a predefined variable for the TARGET.dir subdirectory of
${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY} ? I'm rolling my own -
easy enough -but wanted to double check I'm not missing an easier way to
do it?
No, there is not, and the actual directory name is an implementation detail,
so it might change without further notice (but hasn't for some years and I
don't see why it should soon).
Alex
--
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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] CMake 3.0?
On 2013-10-21 04:12, Gregoire Aujay wrote: I have seen that CMake 2.8.13 has been removed from the Mantis Roadmap. Instead there is a new 3.0 version Can you tell us more about it? See http://permalink.gmane.org/gmane.comp.programming.tools.cmake.devel/8207. -- Matthew -- 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://www.cmake.org/mailman/listinfo/cmake
[CMake] Mixed Fortran and C sources with Visual Studio 10
I'm trying to convert a large(ish) project to cmake. Everything works fine in Linux, but I'm having problems on Windows. Specifically, we have both C and Fortran sources mixed together in a single directory. Cmake is producing an vcxproj file and none of the Fortran code gets compiled. I've been informed that I probably need two project files, one for C and one for Fortran (vfproj). OK -- so why does cmake not then produce two project files? Am I missing a flag or setting somewhere? As a concrete test, I tried this for a CMakeLists.txt file: enable_language(Fortran) enable_language(C) add_executable(tst tst.F cfunc.c) with a trivial Fortran main and C subroutine. It builds fine in Linux, but not on Windows. Everything works so well in Linux that I have a hard time believing that anything complex should be required for Windows -- I must be missing something simple but can't find any information on what it might be. Any suggestions on how to get this to work? I'm using cmake 2.8.11.2 with VS 10 and my Fortran compiler is Intel Composer XE 2013. Thanks, Brian -- 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://www.cmake.org/mailman/listinfo/cmake
[CMake] Meet an error when extracting boost_1_52_0.zip.
hi,all I was working on windows7 and use cmake-2.8.12, swig: C:/swigwin-2.0.10/swig.exe, Python:C:/Python27/python.exe. I meet an error when i compile Bolt source code. the steps as below: 1. Start a Powershell.exe and then enter my work directory. 2. Download Bolt source code by git clone https://github.com/HSA-Libraries/Bolt;. 3. mkdir build cd ./build. 4. Compile the Bolt liabrary with command cmake ../Bolt/superbuild, so it generate build files successful. 5. Open build files with VS2012, then compile all, i meet an error: 3 -- verifying file... 3 file='D:/workspace/Bolt/program/Bolt/build/external/boost/src/boost_1_52_0.zip' 3 -- verifying file... done 3 -- extracting... 3 src='D:/workspace/Bolt/program/Bolt/build/external/boost/src/boost_1_52_0.zip' 3 dst='D:/workspace/Bolt/program/Bolt/build/external/boost/src/Boost' 3 -- extracting... [tar xfz] 3CUSTOMBUILD : CMake error : Problem with archive_write_finish_entry(): Can't restore time 3CUSTOMBUILD : CMake error : Problem extracting tar: D:/workspace/Bolt/program/Bolt/build/external/boost/src/boost_1_52_0.zip 3 -- extracting... [error clean up] 3 CMake Error at Boost-stamp/extract-Boost.cmake:33 (message): 3CUSTOMBUILD : error : extract of 3'D:/workspace/Bolt/program/Bolt/build/external/boost/src/boost_1_52_0.zip' 3failed But when i do this on another PC which installed the same softwares, it work well. IF anyone can give me a little advise? Thanks! Changcheng Wang 25...@163.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://www.cmake.org/mailman/listinfo/cmake
Re: [CMake] Mixed Fortran and C sources with Visual Studio 10
Hi Brian, as I understand it, it is an explicit limitation of Visual Studio that a VS project can only contain a single programming language. The solution to this would to split the sources into separate lists and build libraries from them. An alternative might be to use the Nmake approach - that is, use plain makefiles instead of Visual Studio to build the project. Regards, Arjen -Original Message- From: cmake-boun...@cmake.org [mailto:cmake-boun...@cmake.org] On Behalf Of Brian Wainscott Sent: Tuesday, October 22, 2013 12:50 AM To: cmake@cmake.org Subject: [CMake] Mixed Fortran and C sources with Visual Studio 10 I'm trying to convert a large(ish) project to cmake. Everything works fine in Linux, but I'm having problems on Windows. Specifically, we have both C and Fortran sources mixed together in a single directory. Cmake is producing an vcxproj file and none of the Fortran code gets compiled. I've been informed that I probably need two project files, one for C and one for Fortran (vfproj). OK -- so why does cmake not then produce two project files? Am I missing a flag or setting somewhere? As a concrete test, I tried this for a CMakeLists.txt file: enable_language(Fortran) enable_language(C) add_executable(tst tst.F cfunc.c) with a trivial Fortran main and C subroutine. It builds fine in Linux, but not on Windows. Everything works so well in Linux that I have a hard time believing that anything complex should be required for Windows -- I must be missing something simple but can't find any information on what it might be. Any suggestions on how to get this to work? I'm using cmake 2.8.11.2 with VS 10 and my Fortran compiler is Intel Composer XE 2013. Thanks, Brian -- 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://www.cmake.org/mailman/listinfo/cmake DISCLAIMER: This message is intended exclusively for the addressee(s) and may contain confidential and privileged information. If you are not the intended recipient please notify the sender immediately and destroy this message. Unauthorized use, disclosure or copying of this message is strictly prohibited. The foundation 'Stichting Deltares', which has its seat at Delft, The Netherlands, Commercial Registration Number 41146461, is not liable in any way whatsoever for consequences and/or damages resulting from the improper, incomplete and untimely dispatch, receipt and/or content of this e-mail. -- 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://www.cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, master, updated. v2.8.12-365-g9fb65d7
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 9fb65d7090ca314cd8bfd88e52fefa6905938a6d (commit) via daa0f6f98df6e944a46a8dff13bb247cf7e301b1 (commit) via a8c652342f0e4dcaf933ecb0ce164b44d4997ae4 (commit) via dbd933365ec780d27ab7c0dfba30dc1af1094607 (commit) via 56457837e28de29d4f94b0cc9c47ef314d8f05e1 (commit) from ecfcce44b31ad7a6a39088e950ba36a0d8abc517 (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=9fb65d7090ca314cd8bfd88e52fefa6905938a6d commit 9fb65d7090ca314cd8bfd88e52fefa6905938a6d Merge: ecfcce4 daa0f6f Author: Brad King brad.k...@kitware.com AuthorDate: Mon Oct 21 09:02:00 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Oct 21 09:02:00 2013 -0400 Merge topic 'cmake-syntax-updates' daa0f6f Add Lua-style long brackets and long comments to CMake language a8c6523 cmListFileLexer: Convert CRLF - LF newlines explicitly dbd9333 cmListFileLexer: Allow a leading UTF-8 Byte-Order-Mark (#11137) 5645783 cmListFileLexer: Allow command names with one letter (#14181) --- Summary of changes: Source/cmListFileCache.cxx | 95 +++-- Source/cmListFileCache.h |3 +- Source/cmListFileLexer.c | 462 +++- Source/cmListFileLexer.h | 17 +- Source/cmListFileLexer.in.l| 190 - Source/cmMakefile.cxx |6 + Tests/RunCMake/Syntax/.gitattributes |2 + .../BOM-UTF-16-BE-result.txt} |0 Tests/RunCMake/Syntax/BOM-UTF-16-BE-stderr.txt |6 + Tests/RunCMake/Syntax/BOM-UTF-16-BE.cmake | Bin 0 - 54 bytes .../BOM-UTF-16-LE-result.txt} |0 Tests/RunCMake/Syntax/BOM-UTF-16-LE-stderr.txt |6 + Tests/RunCMake/Syntax/BOM-UTF-16-LE.cmake | Bin 0 - 54 bytes .../BOM-UTF-32-BE-result.txt} |0 Tests/RunCMake/Syntax/BOM-UTF-32-BE-stderr.txt |6 + Tests/RunCMake/Syntax/BOM-UTF-32-BE.cmake | Bin 0 - 108 bytes .../BOM-UTF-32-LE-result.txt} |0 Tests/RunCMake/Syntax/BOM-UTF-32-LE-stderr.txt |6 + Tests/RunCMake/Syntax/BOM-UTF-32-LE.cmake | Bin 0 - 108 bytes Tests/RunCMake/Syntax/BOM-UTF-8-stdout.txt |1 + Tests/RunCMake/Syntax/BOM-UTF-8.cmake |1 + Tests/RunCMake/Syntax/Bracket0-stderr.txt |1 + Tests/RunCMake/Syntax/Bracket0.cmake |1 + Tests/RunCMake/Syntax/Bracket1-stderr.txt |1 + Tests/RunCMake/Syntax/Bracket1.cmake |2 + Tests/RunCMake/Syntax/Bracket2-stdout.txt |2 + Tests/RunCMake/Syntax/Bracket2.cmake |2 + .../BracketBackslash-result.txt} |0 Tests/RunCMake/Syntax/BracketBackslash-stderr.txt |6 + Tests/RunCMake/Syntax/BracketBackslash.cmake |2 + Tests/RunCMake/Syntax/BracketCRLF-stderr.txt |1 + Tests/RunCMake/Syntax/BracketCRLF.cmake|8 + Tests/RunCMake/Syntax/BracketComment0-stdout.txt |1 + Tests/RunCMake/Syntax/BracketComment0.cmake|5 + .../BracketComment1-result.txt}|0 Tests/RunCMake/Syntax/BracketComment1-stderr.txt |4 + Tests/RunCMake/Syntax/BracketComment1.cmake|3 + .../BracketComment2-result.txt}|0 Tests/RunCMake/Syntax/BracketComment2-stderr.txt |4 + Tests/RunCMake/Syntax/BracketComment2.cmake|3 + Tests/RunCMake/Syntax/BracketComment3-stdout.txt |1 + Tests/RunCMake/Syntax/BracketComment3.cmake|4 + .../BracketComment4-result.txt}|0 Tests/RunCMake/Syntax/BracketComment4-stderr.txt |7 + Tests/RunCMake/Syntax/BracketComment4.cmake|3 + Tests/RunCMake/Syntax/BracketComment5-stdout.txt |1 + Tests/RunCMake/Syntax/BracketComment5.cmake|6 + .../BracketNoSpace0-result.txt}|0 Tests/RunCMake/Syntax/BracketNoSpace0-stderr.txt |6 + Tests/RunCMake/Syntax/BracketNoSpace0.cmake|1 + .../BracketNoSpace1-result.txt}|0 Tests/RunCMake/Syntax/BracketNoSpace1-stderr.txt |6 + Tests/RunCMake/Syntax/BracketNoSpace1.cmake|1 + .../BracketNoSpace2-result.txt}|0 Tests/RunCMake/Syntax/BracketNoSpace2-stderr.txt |6 +
[Cmake-commits] CMake branch, master, updated. v2.8.12-369-g595060f
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 595060f3837a7da28810c644177b63d6319631b6 (commit) via 6d50d0197a50680466c075feeda338b3b9418e05 (commit) from 8fa1ceb136dfa6c4d969fe78f4ebb46ae0abe6d0 (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=595060f3837a7da28810c644177b63d6319631b6 commit 595060f3837a7da28810c644177b63d6319631b6 Merge: 8fa1ceb 6d50d01 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Oct 21 09:02:17 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Oct 21 09:02:17 2013 -0400 Merge topic 'policies-generic-docs' 6d50d01 Help: Add introduction section to cmake-policies manual --- Summary of changes: Help/manual/cmake-policies.7.rst | 20 1 files changed, 20 insertions(+), 0 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12-367-g8fa1ceb
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 8fa1ceb136dfa6c4d969fe78f4ebb46ae0abe6d0 (commit) via 216afc8a818c4f8906b17aefedbc9b9ed60564a8 (commit) from 9fb65d7090ca314cd8bfd88e52fefa6905938a6d (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=8fa1ceb136dfa6c4d969fe78f4ebb46ae0abe6d0 commit 8fa1ceb136dfa6c4d969fe78f4ebb46ae0abe6d0 Merge: 9fb65d7 216afc8 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Oct 21 09:02:09 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Oct 21 09:02:09 2013 -0400 Merge topic 'vs12-parallel-cl-FS' 216afc8 MSVC: Add /FS flag for cl = 18 to allow parallel compilation (#14492) --- Summary of changes: Modules/Platform/Windows-MSVC-C.cmake |3 +++ Modules/Platform/Windows-MSVC-CXX.cmake |3 +++ Modules/Platform/Windows-MSVC.cmake |2 +- 3 files changed, 7 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12-380-g6d1444f
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 6d1444feacb1c2d621b776ac61412f92ff0a1c34 (commit) via 187385a8edaaf907e449478706240236a84cd266 (commit) via af2a3ab691140b67cccb67a9417738c5fd502cfb (commit) via 620b0e92fce77ccdfc2f35485e31dcdf756962d5 (commit) via 2d4ce8054900216f554dede6dec843741e8c97f5 (commit) via d6dd264671a10da9c942361b1559d757c35fa0ae (commit) from d06610888dd357a7085be0bfff86f5d5d291771d (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=6d1444feacb1c2d621b776ac61412f92ff0a1c34 commit 6d1444feacb1c2d621b776ac61412f92ff0a1c34 Merge: d066108 187385a Author: Brad King brad.k...@kitware.com AuthorDate: Mon Oct 21 09:02:31 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Oct 21 09:02:31 2013 -0400 Merge topic 'minor-cleanups' 187385a cmCoreTryCompile: Fix typo in comments. af2a3ab cmTarget: Remove unused variable. 620b0e9 target_link_libraries(): Fix code snippet in documentation. 2d4ce80 cmPolicies: Fix typo d6dd264 include(): Use lower case and () to refer to the include() command. --- Summary of changes: Help/command/target_link_libraries.rst |3 ++- Help/policy/CMP0017.rst|2 +- Source/cmCoreTryCompile.cxx|4 ++-- Source/cmIncludeCommand.cxx|2 +- Source/cmTarget.cxx|1 - 5 files changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12-374-gd066108
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 d06610888dd357a7085be0bfff86f5d5d291771d (commit) via 765d783972dbacc336d11803cccf56cdc9aac6c5 (commit) via 52b80b2643acdd2f31582fe20773cc4c3740b9ad (commit) via c076476d7de18802d99d3c715caee54f05d52781 (commit) via f551135208adc1ac8990f5309ec54325cf897d7d (commit) from 595060f3837a7da28810c644177b63d6319631b6 (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=d06610888dd357a7085be0bfff86f5d5d291771d commit d06610888dd357a7085be0bfff86f5d5d291771d Merge: 595060f 765d783 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Oct 21 09:02:26 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Oct 21 09:02:26 2013 -0400 Merge topic 'remove-old-process-execution' 765d783 cmSystemTools: Drop old RunCommand method 52b80b2 exec_program: Re-implement using KWSys Process c076476 cmake: Drop cmake -E comspec Win9x helper f551135 cmExtraEclipseCDT4Generator: Replace RunCommand with RunSingleCommand --- Summary of changes: Help/manual/cmake.1.rst|2 +- Source/CMakeLists.txt | 12 - Source/CPack/cpack.cxx |5 - Source/cmExecProgramCommand.cxx| 196 +++- Source/cmExecProgramCommand.h |4 + Source/cmExtraEclipseCDT4Generator.cxx |2 +- Source/cmSystemTools.cxx | 358 - Source/cmSystemTools.h | 27 - Source/cmWin32ProcessExecution.cxx | 884 Source/cmWin32ProcessExecution.h | 169 -- Source/cmake.cxx |4 - Source/cmcmd.cxx | 14 +- Source/cmw9xcom.cxx| 45 -- Source/ctest.cxx |4 - bootstrap |3 +- 15 files changed, 201 insertions(+), 1528 deletions(-) delete mode 100644 Source/cmWin32ProcessExecution.cxx delete mode 100644 Source/cmWin32ProcessExecution.h delete mode 100644 Source/cmw9xcom.cxx hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12-4208-g739215f
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 739215f342a68c9c91ab64db664159808318b27e (commit) via 6d1444feacb1c2d621b776ac61412f92ff0a1c34 (commit) via d06610888dd357a7085be0bfff86f5d5d291771d (commit) via 595060f3837a7da28810c644177b63d6319631b6 (commit) via 8fa1ceb136dfa6c4d969fe78f4ebb46ae0abe6d0 (commit) via 9fb65d7090ca314cd8bfd88e52fefa6905938a6d (commit) via ecfcce44b31ad7a6a39088e950ba36a0d8abc517 (commit) from 4a9d26b5eb5f46d9f09cfe5366bddb43fd48ec0d (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=739215f342a68c9c91ab64db664159808318b27e commit 739215f342a68c9c91ab64db664159808318b27e Merge: 4a9d26b 6d1444f Author: Brad King brad.k...@kitware.com AuthorDate: Mon Oct 21 09:04:53 2013 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Oct 21 09:04:53 2013 -0400 Merge branch 'master' into next --- Summary of changes: Source/CMakeVersion.cmake |2 +- 1 files changed, 1 insertions(+), 1 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v2.8.12-383-gbf02e75
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 bf02e750796c6b42b0e9d39ba322cd5191489a0e (commit) via b04f3b9a2a116b1956d5342637cda1348a5ee07b (commit) via dba4962b868c3baa7886dcd3f8b597e971a479a2 (commit) from 6d1444feacb1c2d621b776ac61412f92ff0a1c34 (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=bf02e750796c6b42b0e9d39ba322cd5191489a0e commit bf02e750796c6b42b0e9d39ba322cd5191489a0e Merge: 6d1444f b04f3b9 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Oct 21 09:48:04 2013 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Mon Oct 21 09:48:04 2013 -0400 Merge topic 'INTERFACE_LIBRARY-build-targets' b04f3b9 Create make rules for INTERFACE_LIBRARY targets. dba4962 Makefile: Always create clean target command --- Summary of changes: Source/cmComputeTargetDepends.cxx | 10 +++- Source/cmGlobalUnixMakefileGenerator3.cxx | 92 --- Source/cmLocalUnixMakefileGenerator3.cxx| 73 +++--- Source/cmMakefileLibraryTargetGenerator.cxx |3 + Source/cmMakefileTargetGenerator.cxx|1 + Source/cmTarget.cxx | 23 +++ Source/cmTarget.h |3 + Tests/CMakeLists.txt| 17 + Tests/InterfaceBuildTargets/CMakeLists.txt | 13 Tests/InterfaceBuildTargets/main.cxx|5 ++ Tests/InterfaceBuildTargets/testlib.cxx |5 ++ 11 files changed, 171 insertions(+), 74 deletions(-) create mode 100644 Tests/InterfaceBuildTargets/CMakeLists.txt create mode 100644 Tests/InterfaceBuildTargets/main.cxx create mode 100644 Tests/InterfaceBuildTargets/testlib.cxx hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12-4210-g334d6e3
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 334d6e332fde0b7e8336918ebc6d7b8d0f46d54d (commit)
via b04f3b9a2a116b1956d5342637cda1348a5ee07b (commit)
from 739215f342a68c9c91ab64db664159808318b27e (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=334d6e332fde0b7e8336918ebc6d7b8d0f46d54d
commit 334d6e332fde0b7e8336918ebc6d7b8d0f46d54d
Merge: 739215f b04f3b9
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Oct 21 09:47:18 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Oct 21 09:47:18 2013 -0400
Merge topic 'INTERFACE_LIBRARY-build-targets' into next
b04f3b9 Create make rules for INTERFACE_LIBRARY targets.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b04f3b9a2a116b1956d5342637cda1348a5ee07b
commit b04f3b9a2a116b1956d5342637cda1348a5ee07b
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Wed Aug 21 22:00:48 2013 +0200
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Oct 21 09:46:27 2013 -0400
Create make rules for INTERFACE_LIBRARY targets.
The result is that the depends of the target are created.
So,
add_library(somelib foo.cpp)
add_library(anotherlib EXCLUDE_FROM_ALL foo.cpp)
add_library(extra EXCLUDE_FROM_ALL foo.cpp)
target_link_libraries(anotherlib extra)
add_library(iface INTERFACE)
target_link_libraries(iface INTERFACE anotherlib)
Executing 'make iface' will result in the anotherlib and extra targets
being made.
Adding a regular executable to the INTERFACE of an INTERFACE_LIBRARY
will not result in the executable being built with 'make iface' because
of the logic in cmComputeTargetDepends::AddTargetDepend.
So far, this is implemented only for the Makefile generator. Other
generators will follow if this feature is possible for them.
Make INTERFACE_LIBRARY targets part of the all target by default.
Test this by building the all target and making the expected library
EXCLUDE_FROM_ALL.
diff --git a/Source/cmComputeTargetDepends.cxx
b/Source/cmComputeTargetDepends.cxx
index 0829add..7fd4754 100644
--- a/Source/cmComputeTargetDepends.cxx
+++ b/Source/cmComputeTargetDepends.cxx
@@ -208,7 +208,15 @@ void cmComputeTargetDepends::CollectTargetDepends(int
depender_index)
std::setcmStdString emitted;
{
std::vectorstd::string tlibs;
- depender-GetDirectLinkLibraries(0, tlibs, depender);
+ if (depender-GetType() == cmTarget::INTERFACE_LIBRARY)
+{
+// For INTERFACE_LIBRARY depend on the interface instead.
+depender-GetInterfaceLinkLibraries(0, tlibs, depender);
+}
+ else
+{
+depender-GetDirectLinkLibraries(0, tlibs, depender);
+}
// A target should not depend on itself.
emitted.insert(depender-GetName());
for(std::vectorstd::string::const_iterator lib = tlibs.begin();
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx
b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 7ab107f..ce95c08 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -435,6 +435,7 @@ cmGlobalUnixMakefileGenerator3
(l-second.GetType() == cmTarget::SHARED_LIBRARY) ||
(l-second.GetType() == cmTarget::MODULE_LIBRARY) ||
(l-second.GetType() == cmTarget::OBJECT_LIBRARY) ||
+ (l-second.GetType() == cmTarget::INTERFACE_LIBRARY) ||
(l-second.GetType() == cmTarget::UTILITY))
{
// Add this to the list of depends rules in this directory.
@@ -612,6 +613,7 @@ cmGlobalUnixMakefileGenerator3
(t-second.GetType() == cmTarget::SHARED_LIBRARY) ||
(t-second.GetType() == cmTarget::MODULE_LIBRARY) ||
(t-second.GetType() == cmTarget::OBJECT_LIBRARY) ||
+ (t-second.GetType() == cmTarget::INTERFACE_LIBRARY) ||
(t-second.GetType() == cmTarget::UTILITY)))
{
// Add a rule to build the target by name.
@@ -633,6 +635,10 @@ cmGlobalUnixMakefileGenerator3
t-second.GetName(), depends, commands,
true);
+if (t-second.GetType() == cmTarget::INTERFACE_LIBRARY)
+ {
+ continue;
+ }
// Add a fast rule to build the target
std::string localName = lg-GetRelativeTargetDirectory(t-second);
std::string makefileName;
@@ -699,6 +705,7 @@ cmGlobalUnixMakefileGenerator3
|| (t-second.GetType() == cmTarget::SHARED_LIBRARY)
|| (t-second.GetType() == cmTarget::MODULE_LIBRARY)
|| (t-second.GetType() ==
[Cmake-commits] CMake branch, next, updated. v2.8.12-4212-g24146bf
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 24146bfcd7e07a5bf88df300bbf6acc63cc680f1 (commit) via bf02e750796c6b42b0e9d39ba322cd5191489a0e (commit) from 334d6e332fde0b7e8336918ebc6d7b8d0f46d54d (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=24146bfcd7e07a5bf88df300bbf6acc63cc680f1 commit 24146bfcd7e07a5bf88df300bbf6acc63cc680f1 Merge: 334d6e3 bf02e75 Author: Brad King brad.k...@kitware.com AuthorDate: Mon Oct 21 09:48:36 2013 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Mon Oct 21 09:48:36 2013 -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/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12-4214-g51e5088
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 51e5088fd8a56be26d11cac5c2466f27acec69fa (commit)
via 7f177a8ccfbb44a0a22250dfa3caf9c4cc7e984d (commit)
from 24146bfcd7e07a5bf88df300bbf6acc63cc680f1 (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=51e5088fd8a56be26d11cac5c2466f27acec69fa
commit 51e5088fd8a56be26d11cac5c2466f27acec69fa
Merge: 24146bf 7f177a8
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon Oct 21 09:56:20 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Oct 21 09:56:20 2013 -0400
Merge topic 'double-colon-is-imported' into next
7f177a8 Don't create a try_compile test with :: in the name
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f177a8ccfbb44a0a22250dfa3caf9c4cc7e984d
commit 7f177a8ccfbb44a0a22250dfa3caf9c4cc7e984d
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon Oct 21 15:54:24 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Mon Oct 21 15:54:24 2013 +0200
Don't create a try_compile test with :: in the name
diff --git a/Tests/ExportImport/Import/Interface/CMakeLists.txt
b/Tests/ExportImport/Import/Interface/CMakeLists.txt
index e31031c..cf7e2bc 100644
--- a/Tests/ExportImport/Import/Interface/CMakeLists.txt
+++ b/Tests/ExportImport/Import/Interface/CMakeLists.txt
@@ -21,7 +21,7 @@ include(CheckCXXSourceCompiles)
macro(do_try_compile prefix)
- set(CMAKE_REQUIRED_LIBRARIES ${prefix}headeronly)
+ set(CMAKE_REQUIRED_LIBRARIES ${prefix}::headeronly)
check_cxx_source_compiles(
#include \headeronly.h\
@@ -42,7 +42,7 @@ macro(do_try_compile prefix)
endif()
endmacro()
-do_try_compile(bld::)
+do_try_compile(bld)
add_executable(headeronlytest_exp headeronlytest.cpp)
target_link_libraries(headeronlytest_exp exp::headeronly)
@@ -52,4 +52,4 @@ set_property(TARGET exp::sharediface APPEND PROPERTY
INTERFACE_LINK_LIBRARIES de
add_executable(interfacetest_exp interfacetest.cpp)
target_link_libraries(interfacetest_exp exp::sharediface)
-do_try_compile(exp::)
+do_try_compile(exp)
---
Summary of changes:
Tests/ExportImport/Import/Interface/CMakeLists.txt |6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12-4216-ga00f5dc
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 a00f5dc9af0db7055210a566026de7643682649f (commit)
via f063c45589e83bf8e4ef61f49b17084debf085a2 (commit)
from 51e5088fd8a56be26d11cac5c2466f27acec69fa (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=a00f5dc9af0db7055210a566026de7643682649f
commit a00f5dc9af0db7055210a566026de7643682649f
Merge: 51e5088 f063c45
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Mon Oct 21 09:56:53 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Oct 21 09:56:53 2013 -0400
Merge topic 'double-colon-is-imported' into next
f063c45 Consider targets with double colons to be IMPORTED or ALIAS targets.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f063c45589e83bf8e4ef61f49b17084debf085a2
commit f063c45589e83bf8e4ef61f49b17084debf085a2
Author: Stephen Kelly steve...@gmail.com
AuthorDate: Tue Jul 30 09:51:56 2013 +0200
Commit: Stephen Kelly steve...@gmail.com
CommitDate: Mon Oct 21 15:56:31 2013 +0200
Consider targets with double colons to be IMPORTED or ALIAS targets.
Introduce a policy to control the behavior.
The AliasTargets unit test already tests that using a
double-semicolon in the name is not an error. Change the ExportImport
test to use a namespace with a double-semicolon too.
diff --git a/Help/manual/cmake-policies.7.rst b/Help/manual/cmake-policies.7.rst
index 658620f..f03cbe1 100644
--- a/Help/manual/cmake-policies.7.rst
+++ b/Help/manual/cmake-policies.7.rst
@@ -37,3 +37,4 @@ All Policies
/policy/CMP0025
/policy/CMP0026
/policy/CMP0027
+ /policy/CMP0028
diff --git a/Help/policy/CMP0028.rst b/Help/policy/CMP0028.rst
new file mode 100644
index 000..ec318a0
--- /dev/null
+++ b/Help/policy/CMP0028.rst
@@ -0,0 +1,23 @@
+CMP0028
+---
+
+Double colon in target name means ALIAS or IMPORTED target.
+
+CMake 2.8.12 and lower allowed the use of targets and files with double
+colons in target_link_libraries, with some buildsystem generators.
+
+The use of double-colons is a common pattern used to namespace IMPORTED
+targets and ALIAS targets. When computing the link dependencies of a target,
+the name of each dependency could either be a target, or a file on disk.
+Previously, if a target was not found with a matching name, the name was
+considered to refer to a file on disk. This can lead to confusing error
+messages if there is a typo in what should be a target name.
+
+The OLD behavior for this policy is to search for targets, then files on disk,
+even if the search term contains double-colons. The NEW behavior for this
+policy is to issue a FATAL_ERROR if a link dependency contains
+double-colons but is not an IMPORTED target or an ALIAS target.
+
+This policy was introduced in CMake version 3.0.0. CMake version
+|release| warns when the policy is not set and uses OLD behavior. Use
+the cmake_policy command to set it to OLD or NEW explicitly.
diff --git a/Source/cmPolicies.cxx b/Source/cmPolicies.cxx
index ffab8e5..f7efc1e 100644
--- a/Source/cmPolicies.cxx
+++ b/Source/cmPolicies.cxx
@@ -241,6 +241,11 @@ cmPolicies::cmPolicies()
CMP0027, CMP0027,
Conditionally linked imported targets with missing include directories.,
3,0,0,0, cmPolicies::WARN);
+
+ this-DefinePolicy(
+CMP0028, CMP0028,
+Double colon in target name means ALIAS or IMPORTED target.,
+3,0,0,0, cmPolicies::WARN);
}
cmPolicies::~cmPolicies()
diff --git a/Source/cmPolicies.h b/Source/cmPolicies.h
index 39c2afb..68cd7c2 100644
--- a/Source/cmPolicies.h
+++ b/Source/cmPolicies.h
@@ -79,6 +79,7 @@ public:
CMP0026, /// Disallow use of the LOCATION target property.
CMP0027, /// Conditionally linked imported targets with missing include
/// directories.
+CMP0028, /// Double colon in target name means ALIAS or IMPORTED target.
/** \brief Always the last entry.
*
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index b6182ab..647eb76 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -5483,6 +5483,46 @@ void cmTarget::ComputeLinkImplementation(const char*
config,
{
continue;
}
+cmTarget *tgt = this-Makefile-FindTargetToUse(li-c_str());
+
+if(!tgt std::string(item).find(::) != std::string::npos)
+ {
+ bool noMessage = false;
+ cmake::MessageType messageType = cmake::FATAL_ERROR;
+ cmOStringStream e;
+ switch(this-Makefile-GetPolicyStatus(cmPolicies::CMP0028))
+{
+case cmPolicies::WARN:
+ {
+ e (this-Makefile-GetPolicies()
+
[Cmake-commits] CMake branch, next, updated. v2.8.12-4218-g400e9b2
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 400e9b26e55ff96dd5b86d9127ca077e1d444862 (commit)
via af2f76d34137bbaaadbc2eb18d6ff5124dc15b80 (commit)
from a00f5dc9af0db7055210a566026de7643682649f (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=400e9b26e55ff96dd5b86d9127ca077e1d444862
commit 400e9b26e55ff96dd5b86d9127ca077e1d444862
Merge: a00f5dc af2f76d
Author: Peter Kuemmel syntheti...@gmx.net
AuthorDate: Mon Oct 21 09:59:18 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Oct 21 09:59:18 2013 -0400
Merge topic 'ninja-remove-cmcldeps' into next
af2f76d Revert Ninja: use deps = gcc/msvc feature
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=af2f76d34137bbaaadbc2eb18d6ff5124dc15b80
commit af2f76d34137bbaaadbc2eb18d6ff5124dc15b80
Author: Peter Kümmel syntheti...@gmx.net
AuthorDate: Mon Oct 21 15:53:46 2013 +0200
Commit: Peter Kümmel syntheti...@gmx.net
CommitDate: Mon Oct 21 15:54:12 2013 +0200
Revert Ninja: use deps = gcc/msvc feature
This reverts commit ba54dc09fb69488ab95cb967240b09e30a0006b4.
Next commit fixes line sizes.
diff --git a/Modules/CMakeCCompiler.cmake.in b/Modules/CMakeCCompiler.cmake.in
index 804cce2..3e8d4ff 100644
--- a/Modules/CMakeCCompiler.cmake.in
+++ b/Modules/CMakeCCompiler.cmake.in
@@ -55,4 +55,4 @@ set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES
@CMAKE_C_IMPLICIT_LINK_DIRECTORIES@)
set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES
@CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES@)
@SET_CMAKE_CMCLDEPS_EXECUTABLE@
-@SET_CMAKE_CL_SHOWINCLUDES_PREFIX@
+@SET_CMAKE_CL_SHOWINCLUDE_PREFIX@
diff --git a/Modules/CMakeCXXCompiler.cmake.in
b/Modules/CMakeCXXCompiler.cmake.in
index 35aa6c4..777f007 100644
--- a/Modules/CMakeCXXCompiler.cmake.in
+++ b/Modules/CMakeCXXCompiler.cmake.in
@@ -56,4 +56,4 @@ set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES
@CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES@)
set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES
@CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES@)
@SET_CMAKE_CMCLDEPS_EXECUTABLE@
-@SET_CMAKE_CL_SHOWINCLUDES_PREFIX@
+@SET_CMAKE_CL_SHOWINCLUDE_PREFIX@
diff --git a/Modules/CMakeClDeps.cmake b/Modules/CMakeClDeps.cmake
index b46e7c2..0214ead 100644
--- a/Modules/CMakeClDeps.cmake
+++ b/Modules/CMakeClDeps.cmake
@@ -20,7 +20,7 @@
# in front of each include path, so it can remove it.
#
-if(CMAKE_GENERATOR MATCHES Ninja AND CMAKE_C_COMPILER AND CMAKE_COMMAND)
+if(MSVC_C_ARCHITECTURE_ID AND CMAKE_GENERATOR MATCHES Ninja AND
CMAKE_C_COMPILER AND CMAKE_COMMAND)
string(REPLACE cmake.exe cmcldeps.exe CMAKE_CMCLDEPS_EXECUTABLE
${CMAKE_COMMAND})
set(showdir ${CMAKE_BINARY_DIR}/CMakeFiles/ShowIncludes)
file(WRITE ${showdir}/foo.h \n)
@@ -30,5 +30,5 @@ if(CMAKE_GENERATOR MATCHES Ninja AND CMAKE_C_COMPILER AND
CMAKE_COMMAND)
string(REGEX MATCH \n([^:]*:[^:]*:[ \t]*) tmp ${outLine})
set(localizedPrefix ${CMAKE_MATCH_1})
set(SET_CMAKE_CMCLDEPS_EXECUTABLE set(CMAKE_CMCLDEPS_EXECUTABLE
\${CMAKE_CMCLDEPS_EXECUTABLE}\))
- set(SET_CMAKE_CL_SHOWINCLUDES_PREFIX set(CMAKE_CL_SHOWINCLUDES_PREFIX
\${localizedPrefix}\))
+ set(SET_CMAKE_CL_SHOWINCLUDE_PREFIX set(CMAKE_CL_SHOWINCLUDE_PREFIX
\${localizedPrefix}\))
endif()
diff --git a/Modules/CMakeDetermineCCompiler.cmake
b/Modules/CMakeDetermineCCompiler.cmake
index ce0978c..8769c66 100644
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@ -176,13 +176,12 @@ if (CMAKE_CROSSCOMPILING AND NOT _CMAKE_TOOLCHAIN_PREFIX)
endif ()
+include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
include(CMakeFindBinUtils)
if(MSVC_C_ARCHITECTURE_ID)
- include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
set(SET_MSVC_C_ARCHITECTURE_ID
set(MSVC_C_ARCHITECTURE_ID ${MSVC_C_ARCHITECTURE_ID}))
endif()
-
# configure variables set in this file for fast reload later on
configure_file(${CMAKE_ROOT}/Modules/CMakeCCompiler.cmake.in
${CMAKE_PLATFORM_INFO_DIR}/CMakeCCompiler.cmake
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake
b/Modules/CMakeDetermineCXXCompiler.cmake
index d821dcc..c79ba89 100644
--- a/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/Modules/CMakeDetermineCXXCompiler.cmake
@@ -175,13 +175,12 @@ if (CMAKE_CROSSCOMPILING AND NOT
_CMAKE_TOOLCHAIN_PREFIX)
endif ()
+include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
include(CMakeFindBinUtils)
if(MSVC_CXX_ARCHITECTURE_ID)
- include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
set(SET_MSVC_CXX_ARCHITECTURE_ID
set(MSVC_CXX_ARCHITECTURE_ID ${MSVC_CXX_ARCHITECTURE_ID}))
endif()
-
# configure all variables set in this file
[Cmake-commits] CMake branch, next, updated. v2.8.12-4220-ged9516e
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 ed9516ebb09a6f7bab0e7f32e5f153d54fcba760 (commit)
via e66df7ee65a8516ee829d3b63d6ea57e3e9ced87 (commit)
from 400e9b26e55ff96dd5b86d9127ca077e1d444862 (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=ed9516ebb09a6f7bab0e7f32e5f153d54fcba760
commit ed9516ebb09a6f7bab0e7f32e5f153d54fcba760
Merge: 400e9b2 e66df7e
Author: Peter Kuemmel syntheti...@gmx.net
AuthorDate: Mon Oct 21 09:59:31 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Oct 21 09:59:31 2013 -0400
Merge topic 'ninja-remove-cmcldeps-2' into next
e66df7e Ninja: use deps = gcc/msvc feature
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e66df7ee65a8516ee829d3b63d6ea57e3e9ced87
commit e66df7ee65a8516ee829d3b63d6ea57e3e9ced87
Author: Peter Kümmel syntheti...@gmx.net
AuthorDate: Fri Oct 18 12:59:47 2013 +0200
Commit: Peter Kümmel syntheti...@gmx.net
CommitDate: Mon Oct 21 15:58:05 2013 +0200
Ninja: use deps = gcc/msvc feature
cmcldeps is now only used for .rc file processing
diff --git a/Modules/CMakeCCompiler.cmake.in b/Modules/CMakeCCompiler.cmake.in
index 3e8d4ff..804cce2 100644
--- a/Modules/CMakeCCompiler.cmake.in
+++ b/Modules/CMakeCCompiler.cmake.in
@@ -55,4 +55,4 @@ set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES
@CMAKE_C_IMPLICIT_LINK_DIRECTORIES@)
set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES
@CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES@)
@SET_CMAKE_CMCLDEPS_EXECUTABLE@
-@SET_CMAKE_CL_SHOWINCLUDE_PREFIX@
+@SET_CMAKE_CL_SHOWINCLUDES_PREFIX@
diff --git a/Modules/CMakeCXXCompiler.cmake.in
b/Modules/CMakeCXXCompiler.cmake.in
index 777f007..35aa6c4 100644
--- a/Modules/CMakeCXXCompiler.cmake.in
+++ b/Modules/CMakeCXXCompiler.cmake.in
@@ -56,4 +56,4 @@ set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES
@CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES@)
set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES
@CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES@)
@SET_CMAKE_CMCLDEPS_EXECUTABLE@
-@SET_CMAKE_CL_SHOWINCLUDE_PREFIX@
+@SET_CMAKE_CL_SHOWINCLUDES_PREFIX@
diff --git a/Modules/CMakeClDeps.cmake b/Modules/CMakeClDeps.cmake
index 0214ead..b46e7c2 100644
--- a/Modules/CMakeClDeps.cmake
+++ b/Modules/CMakeClDeps.cmake
@@ -20,7 +20,7 @@
# in front of each include path, so it can remove it.
#
-if(MSVC_C_ARCHITECTURE_ID AND CMAKE_GENERATOR MATCHES Ninja AND
CMAKE_C_COMPILER AND CMAKE_COMMAND)
+if(CMAKE_GENERATOR MATCHES Ninja AND CMAKE_C_COMPILER AND CMAKE_COMMAND)
string(REPLACE cmake.exe cmcldeps.exe CMAKE_CMCLDEPS_EXECUTABLE
${CMAKE_COMMAND})
set(showdir ${CMAKE_BINARY_DIR}/CMakeFiles/ShowIncludes)
file(WRITE ${showdir}/foo.h \n)
@@ -30,5 +30,5 @@ if(MSVC_C_ARCHITECTURE_ID AND CMAKE_GENERATOR MATCHES Ninja
AND CMAKE_C_COMPIL
string(REGEX MATCH \n([^:]*:[^:]*:[ \t]*) tmp ${outLine})
set(localizedPrefix ${CMAKE_MATCH_1})
set(SET_CMAKE_CMCLDEPS_EXECUTABLE set(CMAKE_CMCLDEPS_EXECUTABLE
\${CMAKE_CMCLDEPS_EXECUTABLE}\))
- set(SET_CMAKE_CL_SHOWINCLUDE_PREFIX set(CMAKE_CL_SHOWINCLUDE_PREFIX
\${localizedPrefix}\))
+ set(SET_CMAKE_CL_SHOWINCLUDES_PREFIX set(CMAKE_CL_SHOWINCLUDES_PREFIX
\${localizedPrefix}\))
endif()
diff --git a/Modules/CMakeDetermineCCompiler.cmake
b/Modules/CMakeDetermineCCompiler.cmake
index 8769c66..ce0978c 100644
--- a/Modules/CMakeDetermineCCompiler.cmake
+++ b/Modules/CMakeDetermineCCompiler.cmake
@@ -176,12 +176,13 @@ if (CMAKE_CROSSCOMPILING AND NOT _CMAKE_TOOLCHAIN_PREFIX)
endif ()
-include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
include(CMakeFindBinUtils)
if(MSVC_C_ARCHITECTURE_ID)
+ include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
set(SET_MSVC_C_ARCHITECTURE_ID
set(MSVC_C_ARCHITECTURE_ID ${MSVC_C_ARCHITECTURE_ID}))
endif()
+
# configure variables set in this file for fast reload later on
configure_file(${CMAKE_ROOT}/Modules/CMakeCCompiler.cmake.in
${CMAKE_PLATFORM_INFO_DIR}/CMakeCCompiler.cmake
diff --git a/Modules/CMakeDetermineCXXCompiler.cmake
b/Modules/CMakeDetermineCXXCompiler.cmake
index c79ba89..d821dcc 100644
--- a/Modules/CMakeDetermineCXXCompiler.cmake
+++ b/Modules/CMakeDetermineCXXCompiler.cmake
@@ -175,12 +175,13 @@ if (CMAKE_CROSSCOMPILING AND NOT
_CMAKE_TOOLCHAIN_PREFIX)
endif ()
-include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
include(CMakeFindBinUtils)
if(MSVC_CXX_ARCHITECTURE_ID)
+ include(${CMAKE_ROOT}/Modules/CMakeClDeps.cmake)
set(SET_MSVC_CXX_ARCHITECTURE_ID
set(MSVC_CXX_ARCHITECTURE_ID ${MSVC_CXX_ARCHITECTURE_ID}))
endif()
+
# configure all variables set in this file
[Cmake-commits] CMake branch, next, updated. v2.8.12-4232-g1c469b1
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 1c469b1b9577f62c420fcf8182f66bda8fd776b3 (commit)
via e5ec8ad47dc07623b6318bb413e01cc921cf66c4 (commit)
from 979831aee6b68b8c9a39e1f70797637002dd8a73 (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=1c469b1b9577f62c420fcf8182f66bda8fd776b3
commit 1c469b1b9577f62c420fcf8182f66bda8fd776b3
Merge: 979831a e5ec8ad
Author: Brad King brad.k...@kitware.com
AuthorDate: Mon Oct 21 11:31:15 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Oct 21 11:31:15 2013 -0400
Merge topic 'xcode-folder-types' into next
e5ec8ad Xcode: Generate 'folder' source type for directories (#14498)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5ec8ad47dc07623b6318bb413e01cc921cf66c4
commit e5ec8ad47dc07623b6318bb413e01cc921cf66c4
Author: Michael Priestman michael.priest...@autodesk.com
AuthorDate: Mon Oct 21 15:46:25 2013 +0100
Commit: Brad King brad.k...@kitware.com
CommitDate: Mon Oct 21 11:09:59 2013 -0400
Xcode: Generate 'folder' source type for directories (#14498)
Teach the Xcode generator to set 'lastKnownFileType' to be 'folder' for
file references that are directories. If you set 'explicitFileType' to
'sourcecode', then Xcode cannot browse the directory.
diff --git a/Source/cmGlobalXCodeGenerator.cxx
b/Source/cmGlobalXCodeGenerator.cxx
index c8b6832..13ed143 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -876,10 +876,20 @@ cmGlobalXCodeGenerator::CreateXCodeFileReferenceFromPath(
ext = realExt.substr(1);
}
- std::string sourcecode = GetSourcecodeValueFromFileExtension(ext, lang);
-
- fileRef-AddAttribute(explicitFileType,
-this-CreateString(sourcecode.c_str()));
+ // If fullpath references a directory, then we need to specify
+ // lastKnownFileType as folder in order for Xcode to be able to open the
+ // contents of the folder (Xcode 4.6 does not like explicitFileType=folder).
+ if(cmSystemTools::FileIsDirectory(fullpath.c_str()))
+{
+fileRef-AddAttribute(lastKnownFileType,
+ this-CreateString(folder));
+}
+ else
+{
+std::string sourcecode = GetSourcecodeValueFromFileExtension(ext, lang);
+fileRef-AddAttribute(explicitFileType,
+ this-CreateString(sourcecode.c_str()));
+}
// Store the file path relative to the top of the source tree.
std::string path = this-RelativeToSource(fullpath.c_str());
@@ -1009,7 +1019,8 @@
cmGlobalXCodeGenerator::CreateXCodeTargets(cmLocalGenerator* gen,
cmTarget::SourceFileFlags tsFlags =
cmtarget.GetTargetSourceFileFlags(*i);
- if(strcmp(filetype-GetString(), compiled.mach-o.objfile) == 0)
+ if(filetype
+ strcmp(filetype-GetString(), compiled.mach-o.objfile) == 0)
{
externalObjFiles.push_back(xsf);
}
---
Summary of changes:
Source/cmGlobalXCodeGenerator.cxx | 21 -
1 files changed, 16 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, next, updated. v2.8.12-4236-g06db188
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 06db1883b8631f8b5ce86ab75249ca146dcfde07 (commit)
via a80fe4b1d24dff993442a45e63948eeb9e6a3962 (commit)
from 0acb875e9f10337ca0cf2b5186b8f87e07094b64 (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=06db1883b8631f8b5ce86ab75249ca146dcfde07
commit 06db1883b8631f8b5ce86ab75249ca146dcfde07
Merge: 0acb875 a80fe4b
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Mon Oct 21 14:45:58 2013 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Mon Oct 21 14:45:58 2013 -0400
Merge topic 'genex-conversion-warnings' into next
a80fe4b use size_t for GeneratorExpressionContent::ContentLength to fix
some warnings
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a80fe4b1d24dff993442a45e63948eeb9e6a3962
commit a80fe4b1d24dff993442a45e63948eeb9e6a3962
Author: Rolf Eike Beer e...@sf-mail.de
AuthorDate: Mon Oct 21 19:18:16 2013 +0200
Commit: Rolf Eike Beer e...@sf-mail.de
CommitDate: Mon Oct 21 19:58:49 2013 +0200
use size_t for GeneratorExpressionContent::ContentLength to fix some
warnings
CMake/Source/cmGeneratorExpressionParser.cxx: In member function ‘void
cmGeneratorExpressionParser::ParseGeneratorExpression(std::vectorcmGeneratorExpressionEvaluator*)’:
CMake/Source/cmGeneratorExpressionParser.cxx:116:55: warning: conversion to
‘unsigned int’ from ‘long int’ may alter its value [-Wconversion]
CMake/Source/cmGeneratorExpressionParser.cxx:240:39: warning: conversion to
‘int’ from ‘long int’ may alter its value [-Wconversion]
diff --git a/Source/cmGeneratorExpressionEvaluator.cxx
b/Source/cmGeneratorExpressionEvaluator.cxx
index 7fd0fdc..dfd995e 100644
--- a/Source/cmGeneratorExpressionEvaluator.cxx
+++ b/Source/cmGeneratorExpressionEvaluator.cxx
@@ -1446,7 +1446,7 @@ cmGeneratorExpressionNode* GetNode(const std::string
identifier)
//
GeneratorExpressionContent::GeneratorExpressionContent(
const char *startContent,
-unsigned int length)
+size_t length)
: StartContent(startContent), ContentLength(length)
{
diff --git a/Source/cmGeneratorExpressionEvaluator.h
b/Source/cmGeneratorExpressionEvaluator.h
index 218abf1..343e18b 100644
--- a/Source/cmGeneratorExpressionEvaluator.h
+++ b/Source/cmGeneratorExpressionEvaluator.h
@@ -63,7 +63,7 @@ private:
struct TextContent : public cmGeneratorExpressionEvaluator
{
- TextContent(const char *start, unsigned int length)
+ TextContent(const char *start, size_t length)
: Content(start), Length(length)
{
@@ -80,25 +80,25 @@ struct TextContent : public cmGeneratorExpressionEvaluator
return cmGeneratorExpressionEvaluator::Text;
}
- void Extend(unsigned int length)
+ void Extend(size_t length)
{
this-Length += length;
}
- unsigned int GetLength()
+ size_t GetLength()
{
return this-Length;
}
private:
const char *Content;
- unsigned int Length;
+ size_t Length;
};
//
struct GeneratorExpressionContent : public cmGeneratorExpressionEvaluator
{
- GeneratorExpressionContent(const char *startContent, unsigned int length);
+ GeneratorExpressionContent(const char *startContent, size_t length);
void SetIdentifier(std::vectorcmGeneratorExpressionEvaluator* identifier)
{
this-IdentifierChildren = identifier;
@@ -141,7 +141,7 @@ private:
std::vectorcmGeneratorExpressionEvaluator* IdentifierChildren;
std::vectorstd::vectorcmGeneratorExpressionEvaluator* ParamChildren;
const char *StartContent;
- unsigned int ContentLength;
+ size_t ContentLength;
};
#endif
diff --git a/Source/cmGeneratorExpressionLexer.h
b/Source/cmGeneratorExpressionLexer.h
index 5f16712..83d661d 100644
--- a/Source/cmGeneratorExpressionLexer.h
+++ b/Source/cmGeneratorExpressionLexer.h
@@ -19,7 +19,7 @@
//
struct cmGeneratorExpressionToken
{
- cmGeneratorExpressionToken(unsigned type, const char *c, unsigned l)
+ cmGeneratorExpressionToken(unsigned type, const char *c, size_t l)
: TokenType(type), Content(c), Length(l)
{
}
@@ -32,7 +32,7 @@ struct cmGeneratorExpressionToken
};
unsigned TokenType;
const char *Content;
- unsigned Length;
+ size_t Length;
};
/** \class cmGeneratorExpressionLexer
