[cmake-developers] [CMake 0015552]: InstallRequiredSystemLibraries breaks with VS2015
The following issue has been SUBMITTED. == http://www.cmake.org/Bug/view.php?id=15552 == Reported By:patrik Assigned To: == Project:CMake Issue ID: 15552 Category: CMake Reproducibility:always Severity: minor Priority: high Status: new == Date Submitted: 2015-05-02 06:35 EDT Last Modified: 2015-05-02 06:35 EDT == Summary:InstallRequiredSystemLibraries breaks with VS2015 Description: The script breaks with the following warning: CMake Warning at InstallRequiredSystemLibraries.cmake:424 (message): system runtime library file does not exist: C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/redist/x64/Microsoft.VC140.CRT/msvcr140.dll It seems like in VS2015, Microsoft renamed/reorganised their runtime libraries and the file msvcr140.dll doesn't exist anymore. There are 4 dll's in the Microsoft.VC140.CRT/ folder: concrt140.dll msvcp140.dll vccorlib140.dll vcruntime140.dll This may be related: http://blogs.msdn.com/b/vcblog/archive/2015/03/03/introducing-the-universal-crt.aspx?PageIndex=3 == Issue History Date ModifiedUsername FieldChange == 2015-05-02 06:35 patrik New Issue == -- 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 1/3] wxWidgets module: allow specifying required version
Am Samstag, 2. Mai 2015, 00:59:38 schrieb Simon Richter: --- Modules/FindwxWidgets.cmake | 40 1 file changed, 36 insertions(+), 4 deletions(-) diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake index c16c011..ecce49c 100644 --- a/Modules/FindwxWidgets.cmake +++ b/Modules/FindwxWidgets.cmake @@ -103,6 +103,12 @@ #include(${wxWidgets_USE_FILE}) ## and for each of your dependent executable/library targets: #target_link_libraries(YourTarget ${wxWidgets_LIBRARIES}) +# +# If a wxWidgets version or greater is required: +# find_package(wxWidgets 2.8.12 COMPONENTS net gl core base REQUIRED) +# +# If specific wxWidgets version is required: +# find_package(wxWidgets 2.8.12 EXACT COMPONENTS net gl core base REQUIRED) Drop that, it is already documented in the find_package command documentation. Otherwise we would end up replicating half of that documentation in every find module. @@ -856,6 +862,28 @@ else() endif() endif() +# Check if a specfic version was requested by find_package(). +if(wxWidgets_FOUND AND wxWidgets_FIND_VERSION) Drop that if, just extract the version always. And just make it dependend on the include paths being found. That way even if no specific version was requested the version found will be shown in CMake output. + find_file(_filename wx/version.h PATHS ${wxWidgets_INCLUDE_DIRS} NO_DEFAULT_PATH) + dbg_msg(_filename: ${_filename}) + + if(NOT _filename) +message(FATAL_ERROR wxWidgets wx/version.h file not found in ${wxWidgets_INCLUDE_DIRS}.) + endif() + + file(READ ${_filename} _wx_version_h) + + string(REGEX REPLACE ^(.*\n)?#define wxMAJOR_VERSION[ ]+([0-9]+).* +\\2 wxWidgets_VERSION_MAJOR ${_wx_version_h} ) + string(REGEX REPLACE ^(.*\n)?#define wxMINOR_VERSION[ ]+([0-9]+).* +\\2 wxWidgets_VERSION_MINOR ${_wx_version_h} ) + string(REGEX REPLACE ^(.*\n)?#define wxRELEASE_NUMBER[ ]+([0-9]+).* +\\2 wxWidgets_VERSION_PATCH ${_wx_version_h} ) You should allow any amount of spaces and tabs also between the #define and the constant name, if they decide to reformat their sources in the next version the CMake module will continue to work. + set(wxWidgets_VERSION_STRING + ${wxWidgets_VERSION_MAJOR}.${wxWidgets_VERSION_MINOR}.${wxWidgets_VERSION_ PATCH} ) + dbg_msg(wxWidgets_VERSION_STRING: ${wxWidgets_VERSION_STRING}) +endif() + # Debug output: DBG_MSG(wxWidgets_FOUND : ${wxWidgets_FOUND}) DBG_MSG(wxWidgets_INCLUDE_DIRS: ${wxWidgets_INCLUDE_DIRS}) @@ -866,10 +894,14 @@ DBG_MSG(wxWidgets_USE_FILE: ${wxWidgets_USE_FILE}) #= #= -include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(wxWidgets DEFAULT_MSG wxWidgets_FOUND) -# Maintain consistency with all other variables. -set(wxWidgets_FOUND ${WXWIDGETS_FOUND}) + +include(FindPackageHandleStandardArgs) The other include is the correct one for an upstream CMake module. + +find_package_handle_standard_args(wxWidgets + FOUND_VAR wxWidgets_FOUND You can drop that, this variable will always be set. On the other hand: the variable is already set above by hand, which probably is also wrong. Greetings, Eike signature.asc Description: This is a digitally signed message part. -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] [CMake 0015553]: FindGTest.cmake doesn't handle all spaces in TEST / TEST_F macro
The following issue has been SUBMITTED. == http://www.cmake.org/Bug/view.php?id=15553 == Reported By:Thiago M. Assigned To: == Project:CMake Issue ID: 15553 Category: Modules Reproducibility:always Severity: minor Priority: normal Status: new == Date Submitted: 2015-05-02 09:22 EDT Last Modified: 2015-05-02 09:22 EDT == Summary:FindGTest.cmake doesn't handle all spaces in TEST / TEST_F macro Description: The GTEST_ADD_TESTS() macro does not handle all space configurations in the test macros: - Spaces between the test suíte name and the comma: TEST(TestSuite ,TestName) - Spaces between the macro name and the open parenthesis: TEST (TestSuite,TestName) For the first one, the test is not detected. For the second one, the test name is wrongly parsed and results in errors when trying to run it. Steps to Reproduce: 1. Create a test file with the following content: #include gtest/gtest.h TEST (TestSuite,Test1) { } TEST(TestSuite ,Test2) { } 2. Create a CMakeLists.txt that creates an executable for this test file and uses GTEST_ADD_TESTS() to create the CTest targets. An example list file in attached to this issue. 3. Configure and compile the CMake project and run the test executable. The GTest output shows the two tests are executed with success: $ ./GTestParseError Running main() from gtest_main.cc [==] Running 2 tests from 1 test case. [--] Global test environment set-up. [--] 2 tests from TestSuite [ RUN ] TestSuite.Test1 [ OK ] TestSuite.Test1 (0 ms) [ RUN ] TestSuite.Test2 [ OK ] TestSuite.Test2 (0 ms) [--] 2 tests from TestSuite (1 ms total) [--] Global test environment tear-down [==] 2 tests from 1 test case ran. (1 ms total) [ PASSED ] 2 tests. 4. Run CTest (with make test, for instance). Only one test will be executed, with the wrong name, and it will fail. $ make test Running tests... Test project /home/myUser/Test-build Start 1: TEST Could not find executable ( Looked in the following places: ( ( Release/( Release/( Debug/( Debug/( MinSizeRel/( MinSizeRel/( RelWithDebInfo/( RelWithDebInfo/( Deployment/( Deployment/( Development/( Development/( Unable to find executable: ( 1/1 Test http://www.cmake.org/Bug/view.php?id=1: TEST .***Not Run 0.00 sec 0% tests passed, 1 tests failed out of 1 Total Test time (real) = 0.00 sec The following tests FAILED: 1 - TEST (Not Run) Errors while running CTest Makefile:75: recipe for target 'test' failed make: *** [test] Error 8 Additional Information: The GTEST_ADD_TESTS() macro already support spaces between: - The open parenthesis and the test suíte name - The test name and the close parenthesis This support was added in issue http://www.cmake.org/Bug/view.php?id=10065. == Issue History Date ModifiedUsername FieldChange == 2015-05-02 09:22 Thiago M. New Issue 2015-05-02 09:22 Thiago M. File Added: CMakeLists.txt == -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
Re: [cmake-developers] [CMake 0011944]: CPackDeb: Support dependencies between components/Debian packages
2015-04-29 18:35 GMT+02:00 Domen Vrankar domen.vran...@gmail.com: Applied with minor changes - added component text from your other patch - changed CPACK_DEBIAN_PACKAGE_DESCRIPTION documentation to more accurately describe fall back options http://www.cmake.org/gitweb?p=cmake.git;a=commit;h=2f0afff Applied patch 0001-CPackDEB-Enabling-the-dependency-auto-discovery-per-.patch to next with some changes: - added slightly modified relevant documentation fixes from your 0001-CPackDeb-reworked-documentation.patch patch - added dpkg-deb executable check before test http://www.cmake.org/gitweb?p=cmake.git;a=commit;h=04f4284 Thanks, Domen -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers