[CMake] Correct way to set machos-min-version in Cmake 3.2.1
Hello,
I’d imagine this is a FAQ, but I’ve Googled without success. Apologies if the
answer is out there.
With Cmake 3.2.1, some behaviour seems to have changed, in the handling of
CMAKE_OSX_DEPLOYMENT_TARGET.
I am trying to build using the 10.9 SDK, but with macosx-min-version set to
10.7 (I need to code-sign on 10.9 for Gatekeeper v2).
Previously I was doing:
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.7)
And this would cause cmake to set:
-mmacosx-version-min=10.7
As of 3.2.1, setting CMAKE_OSX_DEPLOYMENT_TARGET to 10.7 fail (with newest
Xcode) because there is no 10.7 SDK. So I changed my CMake files to do:
SET(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7”)
This works but unfortunately CMake i.s explicitly setting the flag too, so I
end up with both value in my CXXFLAGS:
-mmacosx-version-min=10.9
-mmacosx-version-min=10.7
What is the correct way to request this now, such that the flag is only
generated once?
All of the above with latest Xcode and using Xcode project files.
Kind regards,
James
--
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] nonstandard C++ source filename extension
Hi Dave.
This looks like a message directly from your compiler. Does it work if you
try to compile the file manually (no CMake)?
Petr
On Tue, Mar 17, 2015 at 5:10 AM, Dave Yost d...@yost.com wrote:
From what I can glean online, I’ve tried this:
set_source_files_properties(foo.bar PROPERTIES LANGUAGE CXX)
add_executable(foo foo.bar)
set_target_properties(foo PROPERTIES LINKER_LANGUAGE CXX)
but it doesn’t work.
What am I missing?
0 Mon 20:16:15 yost
1181 Z% cat CMakeLists.txt
cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
project(asm CXX)
set_source_files_properties(foo.bar PROPERTIES LANGUAGE CXX)
add_executable(foo foo.bar)
set_target_properties(foo PROPERTIES LINKER_LANGUAGE CXX)
0 Mon 20:16:43 yost
1182 Z% cat foo.bar
#include iostream
int main(int argc, char* argv[]) {
std::cout Hello\\n;
return 0;
}
0 Mon 20:16:46 yost
1183 Z% cd build ; cmake ..
-- The CXX compiler identification is GNU 4.9.2
-- Checking whether CXX compiler has -isysroot
-- Checking whether CXX compiler has -isysroot - yes
-- Checking whether CXX compiler supports OSX deployment target flag
-- Checking whether CXX compiler supports OSX deployment target flag - yes
-- Check for working CXX compiler: /opt/local/bin/c++
-- Check for working CXX compiler: /opt/local/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- Configuring done
-- Generating done
-- Build files have been written to: /Users/yost/p/c++/cmake/asm/build
0 Mon 20:16:58 yost
1184 Z% make
Scanning dependencies of target foo
[100%] Building CXX object CMakeFiles/foo.dir/foo.bar.o
c++: warning: /Users/yost/p/c++/cmake/asm/foo.bar: linker input file
unused because linking not done
Linking CXX executable foo
c++: error: CMakeFiles/foo.dir/foo.bar.o: No such file or directory
CMakeFiles/foo.dir/build.make:85: recipe for target 'foo' failed
make[2]: *** [foo] Error 1
CMakeFiles/Makefile2:60: recipe for target 'CMakeFiles/foo.dir/all' failed
make[1]: *** [CMakeFiles/foo.dir/all] Error 2
Makefile:75: recipe for target 'all' failed
make: *** [all] Error 2
2 Mon 20:17:01 yost
1185 Z% rm -rf * ; cmake ..
zsh: sure you want to delete all the files in
/Users/yost/p/c++/cmake/asm/build [yn]? y
-- The CXX compiler identification is GNU 4.9.2
-- Checking whether CXX compiler has -isysroot
-- Checking whether CXX compiler has -isysroot - yes
-- Checking whether CXX compiler supports OSX deployment target flag
-- Checking whether CXX compiler supports OSX deployment target flag - yes
-- Check for working CXX compiler: /opt/local/bin/c++
-- Check for working CXX compiler: /opt/local/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- Configuring done
-- Generating done
-- Build files have been written to: /Users/yost/p/c++/cmake/asm/build
0 Mon 20:23:00 yost
1201 Z% make VERBOSE=1
/Applications/CMake.app/Contents/bin/cmake -H/Users/yost/p/c++/cmake/asm
-B/Users/yost/p/c++/cmake/asm/build --check-build-system
CMakeFiles/Makefile.cmake 0
/Applications/CMake.app/Contents/bin/cmake -E cmake_progress_start
/Users/yost/p/c++/cmake/asm/build/CMakeFiles
/Users/yost/p/c++/cmake/asm/build/CMakeFiles/progress.marks
make -f CMakeFiles/Makefile2 all
make[1]: Entering directory '/Users/yost/p/c++/cmake/asm/build'
make -f CMakeFiles/foo.dir/build.make CMakeFiles/foo.dir/depend
make[2]: Entering directory '/Users/yost/p/c++/cmake/asm/build'
cd /Users/yost/p/c++/cmake/asm/build
/Applications/CMake.app/Contents/bin/cmake -E cmake_depends Unix
Makefiles /Users/yost/p/c++/cmake/asm /Users/yost/p/c++/cmake/asm
/Users/yost/p/c++/cmake/asm/build /Users/yost/p/c++/cmake/asm/build
/Users/yost/p/c++/cmake/asm/build/CMakeFiles/foo.dir/DependInfo.cmake
--color=
Dependee
/Users/yost/p/c++/cmake/asm/build/CMakeFiles/foo.dir/DependInfo.cmake is
newer than depender
/Users/yost/p/c++/cmake/asm/build/CMakeFiles/foo.dir/depend.internal.
Dependee
/Users/yost/p/c++/cmake/asm/build/CMakeFiles/CMakeDirectoryInformation.cmake
is newer than depender
/Users/yost/p/c++/cmake/asm/build/CMakeFiles/foo.dir/depend.internal.
Scanning dependencies of target foo
make[2]: Leaving directory '/Users/yost/p/c++/cmake/asm/build'
make -f CMakeFiles/foo.dir/build.make CMakeFiles/foo.dir/build
make[2]: Entering directory '/Users/yost/p/c++/cmake/asm/build'
/Applications/CMake.app/Contents/bin/cmake -E cmake_progress_report
/Users/yost/p/c++/cmake/asm/build/CMakeFiles 1
[100%] Building CXX object CMakeFiles/foo.dir/foo.bar.o
/opt/local/bin/c++ -o CMakeFiles/foo.dir/foo.bar.o -c
/Users/yost/p/c++/cmake/asm/foo.bar
c++: warning: /Users/yost/p/c++/cmake/asm/foo.bar: linker input file
unused because linking not done
Linking CXX executable foo
Re: [CMake] DEB package generated with cpack does not pass lintian check on Ubuntu
Hi, you have to differ here: lintian is for checking packaging policy of distribution packages for Debian and derivatives like Ubuntu. Cpack does not necessarily create packages according to these policies but still valid packages. If dpkg eats it without errors, it's ok for out-of-distribution packages. HS Am 17. März 2015 00:25:18 MEZ, schrieb Bogdan Cristea crist...@gmail.com: Hi I have generated a DEB package with cpack, but the analysis with lintian in Ubuntu reveals still some errors: E: at: changelog-file-missing-in-native-package E: at: control-file-has-bad-owner md5sums b/users != root/root E: at: no-copyright-file E: at: extended-description-is-empty E: at: maintainer-name-missing a...@gmail.com Use of uninitialized value $name in pattern match (m//) at /usr/share/perl5/Lintian/Check.pm line 203. E: at: wrong-file-owner-uid-or-gid usr/ 1000/100 E: at: wrong-file-owner-uid-or-gid usr/bin/ 1000/100 E: at: wrong-file-owner-uid-or-gid usr/bin/AT 1000/100 W: at: binary-without-manpage usr/bin/AT Could someone tell me how can I solve these ? thanks Bogdan -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake
Re: [CMake] Problems with WriteCompilerDetectionHeader and cxx_nullptr
On 03/16/2015 03:05 AM, Roman Wüger wrote: attached is an updated patch. Applied, thanks: WCDH: Fix cxx_nullptr workaround for pre-C++11 compilers http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9d09626 -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] nonstandard C++ source filename extension
Hi Dave,
try
add_definitions(-x c++)
CMakeLists.txt
cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
project(asm CXX)
add_definitions(-x c++)
set_source_files_properties(foo.bar PROPERTIES LANGUAGE CXX)
add_executable(foo foo.bar)
set_target_properties(foo PROPERTIES LINKER_LANGUAGE CXX)
Adam
On Tue, Mar 17, 2015 at 2:10 PM, Dave Yost d...@yost.com wrote:
From what I can glean online, I’ve tried this:
set_source_files_properties(foo.bar PROPERTIES LANGUAGE CXX)
add_executable(foo foo.bar)
set_target_properties(foo PROPERTIES LINKER_LANGUAGE CXX)
but it doesn’t work.
What am I missing?
0 Mon 20:16:15 yost
1181 Z% cat CMakeLists.txt
cmake_minimum_required(VERSION 3.0 FATAL_ERROR)
project(asm CXX)
set_source_files_properties(foo.bar PROPERTIES LANGUAGE CXX)
add_executable(foo foo.bar)
set_target_properties(foo PROPERTIES LINKER_LANGUAGE CXX)
0 Mon 20:16:43 yost
1182 Z% cat foo.bar
#include iostream
int main(int argc, char* argv[]) {
std::cout Hello\\n;
return 0;
}
0 Mon 20:16:46 yost
1183 Z% cd build ; cmake ..
-- The CXX compiler identification is GNU 4.9.2
-- Checking whether CXX compiler has -isysroot
-- Checking whether CXX compiler has -isysroot - yes
-- Checking whether CXX compiler supports OSX deployment target flag
-- Checking whether CXX compiler supports OSX deployment target flag - yes
-- Check for working CXX compiler: /opt/local/bin/c++
-- Check for working CXX compiler: /opt/local/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- Configuring done
-- Generating done
-- Build files have been written to: /Users/yost/p/c++/cmake/asm/build
0 Mon 20:16:58 yost
1184 Z% make
Scanning dependencies of target foo
[100%] Building CXX object CMakeFiles/foo.dir/foo.bar.o
c++: warning: /Users/yost/p/c++/cmake/asm/foo.bar: linker input file
unused because linking not done
Linking CXX executable foo
c++: error: CMakeFiles/foo.dir/foo.bar.o: No such file or directory
CMakeFiles/foo.dir/build.make:85: recipe for target 'foo' failed
make[2]: *** [foo] Error 1
CMakeFiles/Makefile2:60: recipe for target 'CMakeFiles/foo.dir/all' failed
make[1]: *** [CMakeFiles/foo.dir/all] Error 2
Makefile:75: recipe for target 'all' failed
make: *** [all] Error 2
2 Mon 20:17:01 yost
1185 Z% rm -rf * ; cmake ..
zsh: sure you want to delete all the files in
/Users/yost/p/c++/cmake/asm/build [yn]? y
-- The CXX compiler identification is GNU 4.9.2
-- Checking whether CXX compiler has -isysroot
-- Checking whether CXX compiler has -isysroot - yes
-- Checking whether CXX compiler supports OSX deployment target flag
-- Checking whether CXX compiler supports OSX deployment target flag - yes
-- Check for working CXX compiler: /opt/local/bin/c++
-- Check for working CXX compiler: /opt/local/bin/c++ -- works
-- Detecting CXX compiler ABI info
-- Detecting CXX compiler ABI info - done
-- Detecting CXX compile features
-- Detecting CXX compile features - done
-- Configuring done
-- Generating done
-- Build files have been written to: /Users/yost/p/c++/cmake/asm/build
0 Mon 20:23:00 yost
1201 Z% make VERBOSE=1
/Applications/CMake.app/Contents/bin/cmake -H/Users/yost/p/c++/cmake/asm
-B/Users/yost/p/c++/cmake/asm/build --check-build-system
CMakeFiles/Makefile.cmake 0
/Applications/CMake.app/Contents/bin/cmake -E cmake_progress_start
/Users/yost/p/c++/cmake/asm/build/CMakeFiles
/Users/yost/p/c++/cmake/asm/build/CMakeFiles/progress.marks
make -f CMakeFiles/Makefile2 all
make[1]: Entering directory '/Users/yost/p/c++/cmake/asm/build'
make -f CMakeFiles/foo.dir/build.make CMakeFiles/foo.dir/depend
make[2]: Entering directory '/Users/yost/p/c++/cmake/asm/build'
cd /Users/yost/p/c++/cmake/asm/build
/Applications/CMake.app/Contents/bin/cmake -E cmake_depends Unix
Makefiles /Users/yost/p/c++/cmake/asm /Users/yost/p/c++/cmake/asm
/Users/yost/p/c++/cmake/asm/build /Users/yost/p/c++/cmake/asm/build
/Users/yost/p/c++/cmake/asm/build/CMakeFiles/foo.dir/DependInfo.cmake
--color=
Dependee
/Users/yost/p/c++/cmake/asm/build/CMakeFiles/foo.dir/DependInfo.cmake is
newer than depender
/Users/yost/p/c++/cmake/asm/build/CMakeFiles/foo.dir/depend.internal.
Dependee
/Users/yost/p/c++/cmake/asm/build/CMakeFiles/CMakeDirectoryInformation.cmake
is newer than depender
/Users/yost/p/c++/cmake/asm/build/CMakeFiles/foo.dir/depend.internal.
Scanning dependencies of target foo
make[2]: Leaving directory '/Users/yost/p/c++/cmake/asm/build'
make -f CMakeFiles/foo.dir/build.make CMakeFiles/foo.dir/build
make[2]: Entering directory '/Users/yost/p/c++/cmake/asm/build'
/Applications/CMake.app/Contents/bin/cmake -E cmake_progress_report
/Users/yost/p/c++/cmake/asm/build/CMakeFiles 1
[100%] Building CXX object CMakeFiles/foo.dir/foo.bar.o
/opt/local/bin/c++ -o CMakeFiles/foo.dir/foo.bar.o -c
/Users/yost/p/c++/cmake/asm/foo.bar
c++:
Re: [CMake] Full paths for transitive dependencies
I happened to stumble acrosss this today. I fixed it by adding another
find_package to the last project but this seems to defeat the purpose of
transitive dependencies. What am I doing wrong?
Here's a more detailed example
(https://github.com/toomuchatonce/cmake_transient_issue.git)
---
app - CMakeLists.txt
cmake_minimum_required(VERSION 3.0.2)
add_executable(app main.cpp)
# uncomment to fix link error
#find_package( a NO_MODULE REQUIRED )
find_package( b NO_MODULE REQUIRED )
target_link_libraries(app b)
install(TARGETS app RUNTIME DESTINATION bin)
---
libb - CMakeLists.txt
cmake_minimum_required (VERSION 3.0.2)
project(b)
find_package(a NO_MODULE REQUIRED )
add_library(b lib.cpp)
target_link_libraries(b a)
target_include_directories(b PUBLIC $INSTALL_INTERFACE:include/b)
install(TARGETS b EXPORT bConfig ARCHIVE DESTINATION lib/b )
install(FILES b.h DESTINATION include/b)
install(EXPORT bConfig DESTINATION lib/cmake/b )
--
liba - CMakeLists.txt
cmake_minimum_required (VERSION 3.0.2)
project(a)
add_library(a lib.cpp)
target_include_directories(a INTERFACE $INSTALL_INTERFACE:include/a)
install(TARGETS a EXPORT aConfig ARCHIVE DESTINATION lib/a )
install(FILES a.h DESTINATION include/a)
install(EXPORT aConfig DESTINATION lib/cmake/a )
--
superbuild - CMakeLists.txt
cmake_minimum_required( VERSION 3.0.2 )
include(ExternalProject)
set(DEVROOT ${CMAKE_BINARY_DIR}/devroot)
set(CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${DEVROOT})
ExternalProject_Add(
a
CMAKE_ARGS ${CMAKE_ARGS}
SOURCE_DIR ${CMAKE_SOURCE_DIR}/../liba
)
ExternalProject_Add(
b
DEPENDS a
CMAKE_ARGS ${CMAKE_ARGS}
SOURCE_DIR ${CMAKE_SOURCE_DIR}/../libb
)
ExternalProject_Add(
app
DEPENDS b
CMAKE_ARGS ${CMAKE_ARGS}
SOURCE_DIR ${CMAKE_SOURCE_DIR}/../app
)
Regards,
Adam
On Tue, Mar 17, 2015 at 4:50 AM, Stephen Kelly steve...@gmail.com wrote:
Richard Taylor wrote:
http://www.cmake.org/Wiki/CMake/Tutorials/How_to_create_a_ProjectConfig.cmake_file
Prefer the official documentation instead of the wiki wherever official
documentation exists (especially if it is well-formatted; that means it's
probably recent and maintained).
http://www.cmake.org/cmake/help/v3.0/manual/cmake-packages.7.html
However, only the names of dependent targets are set (via
INTERFACE_LINK_LIBRARIES in targetnameTargets.cmake)
I guess that's where the problem lies, I'm just not sure how to fix it..
The above link documents a find_dependency macro, which you might make use
of.
Thanks,
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://public.kitware.com/mailman/listinfo/cmake
--
Powered by www.kitware.com
Please keep messages on-topic and check the CMake FAQ at:
http://www.cmake.org/Wiki/CMake_FAQ
Kitware offers various services to support the CMake community. For more
information on each offering, please visit:
CMake Support: http://cmake.org/cmake/help/support.html
CMake Consulting: http://cmake.org/cmake/help/consulting.html
CMake Training Courses: http://cmake.org/cmake/help/training.html
Visit other Kitware open-source projects at
http://www.kitware.com/opensource/opensource.html
Follow this link to subscribe/unsubscribe:
http://public.kitware.com/mailman/listinfo/cmake
[CMake] How do one manage external projects in a clean way?
Hello! I would like to manage external libraries called in my code. My goal is to let users install these libraries by themselves or let CMake download and install these libraries for them. For the moment, I use External_project_add command to download external libraries. This works good and I am very happy with it. However, I do not understand the meaning of some subdirectories (xxx-build, xxx-stamp, etc.). It is a problem for me because I sometimes need to specify my own configuration, building and installation commands for some specific libraries. Unfortunately, I never know where to put the result of these steps. Thus, my installation directory may be very dirty and I would like to tidy it. Could someone help me? Furhtermore, I would like to let users provide their own installation for all or some of these external libraries called in my code. Could someone explain me how to manage these options? Thnak you very much for your help! Best regards, Cédric Doucet INRIA Paris-Rocquencourt France -- 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.2.1-1049-g53cbf3a
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 53cbf3a06bca2772947ccfa960523d09caa59285 (commit)
via 98d240d859f0c462bed41edfdf19507043e10c04 (commit)
via 7d6bb488e1754288574dccbb447b49388929af8b (commit)
from ee0d5f1e984acfed8220bf474c5b32f583a584a8 (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=53cbf3a06bca2772947ccfa960523d09caa59285
commit 53cbf3a06bca2772947ccfa960523d09caa59285
Merge: ee0d5f1 98d240d
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Mar 17 11:40:27 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 17 11:40:27 2015 -0400
Merge topic 'ctest-repeat-until-fail' into next
98d240d8 Help: Add notes for topic 'ctest-repeat-until-fail'
7d6bb488 ctest: Refine --repeat-until-fail documentation
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=98d240d859f0c462bed41edfdf19507043e10c04
commit 98d240d859f0c462bed41edfdf19507043e10c04
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Mar 17 11:39:43 2015 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Mar 17 11:39:43 2015 -0400
Help: Add notes for topic 'ctest-repeat-until-fail'
diff --git a/Help/release/dev/ctest-repeat-until-fail.rst
b/Help/release/dev/ctest-repeat-until-fail.rst
new file mode 100644
index 000..8a679c6
--- /dev/null
+++ b/Help/release/dev/ctest-repeat-until-fail.rst
@@ -0,0 +1,5 @@
+ctest-repeat-until-fail
+---
+
+* The :manual:`ctest(1)` tool learned a new ``--repeat-until-fail n``
+ option to help find sporadic test failures.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7d6bb488e1754288574dccbb447b49388929af8b
commit 7d6bb488e1754288574dccbb447b49388929af8b
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Mar 17 11:38:33 2015 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Mar 17 11:38:33 2015 -0400
ctest: Refine --repeat-until-fail documentation
diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst
index 99d33e7..dd3bcfb 100644
--- a/Help/manual/ctest.1.rst
+++ b/Help/manual/ctest.1.rst
@@ -194,11 +194,10 @@ Options
subsequent calls to ctest with the --rerun-failed option will run
the set of tests that most recently failed (if any).
-``--repeat-until-fail N``
- Run each test N times until N runs or a test fails.
+``--repeat-until-fail n``
+ Require each test to run ``n`` times without failing in order to pass.
- This option allows you to run each test multiple times until a test failes.
- This is useful in finding random failures in test cases.
+ This is useful in finding sporadic failures in test cases.
``--max-width width``
Set the max width for a test name to output
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index 069c45e..0fc47b7 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -75,8 +75,8 @@ static const char * cmDocumentationOptions[][2] =
Run a specific number of tests by number.},
{-U, --union, Take the Union of -I and -R},
{--rerun-failed, Run only the tests that failed previously},
- {--repeat-until-fail N, Run each test N times
-until the test runs N times or the test fails.},
+ {--repeat-until-fail n, Require each test to run n
+ times without failing in order to pass},
{--max-width width, Set the max width for a test name to output},
{--interactive-debug-mode [0|1], Set the interactive mode to 0 or 1.},
{--no-label-summary, Disable timing summary information for labels.},
---
Summary of changes:
Help/manual/ctest.1.rst |7 +++
Help/release/dev/ctest-repeat-until-fail.rst |5 +
Source/ctest.cxx |4 ++--
3 files changed, 10 insertions(+), 6 deletions(-)
create mode 100644 Help/release/dev/ctest-repeat-until-fail.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.2.1-1052-g13af2b0
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 13af2b0fdf0695e57434a1280a3516639923d19c (commit)
via 2bf0dec52a41c7eca81e5202c8036832c13ee8ba (commit)
via 83620f005466912adc850cc84abb38e62ea988e0 (commit)
from 53cbf3a06bca2772947ccfa960523d09caa59285 (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=13af2b0fdf0695e57434a1280a3516639923d19c
commit 13af2b0fdf0695e57434a1280a3516639923d19c
Merge: 53cbf3a 2bf0dec
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Mar 17 11:43:24 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 17 11:43:24 2015 -0400
Merge topic 'ctest-repeat-until-fail' into next
2bf0dec5 Help: Add notes for topic 'ctest-repeat-until-fail'
83620f00 ctest: Add a new --repeat-until-fail option
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2bf0dec52a41c7eca81e5202c8036832c13ee8ba
commit 2bf0dec52a41c7eca81e5202c8036832c13ee8ba
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Mar 17 11:39:43 2015 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Mar 17 11:41:24 2015 -0400
Help: Add notes for topic 'ctest-repeat-until-fail'
diff --git a/Help/release/dev/ctest-repeat-until-fail.rst
b/Help/release/dev/ctest-repeat-until-fail.rst
new file mode 100644
index 000..8a679c6
--- /dev/null
+++ b/Help/release/dev/ctest-repeat-until-fail.rst
@@ -0,0 +1,5 @@
+ctest-repeat-until-fail
+---
+
+* The :manual:`ctest(1)` tool learned a new ``--repeat-until-fail n``
+ option to help find sporadic test failures.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=83620f005466912adc850cc84abb38e62ea988e0
commit 83620f005466912adc850cc84abb38e62ea988e0
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Thu Mar 5 16:51:10 2015 -0500
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Mar 17 11:41:10 2015 -0400
ctest: Add a new --repeat-until-fail option
This option tells ctest to run each test N times until the test fails or
the N times have run. This is useful for finding random failing tests.
diff --git a/Help/manual/ctest.1.rst b/Help/manual/ctest.1.rst
index cc132c2..dd3bcfb 100644
--- a/Help/manual/ctest.1.rst
+++ b/Help/manual/ctest.1.rst
@@ -194,6 +194,11 @@ Options
subsequent calls to ctest with the --rerun-failed option will run
the set of tests that most recently failed (if any).
+``--repeat-until-fail n``
+ Require each test to run ``n`` times without failing in order to pass.
+
+ This is useful in finding sporadic failures in test cases.
+
``--max-width width``
Set the max width for a test name to output
diff --git a/Source/CTest/cmCTestMultiProcessHandler.cxx
b/Source/CTest/cmCTestMultiProcessHandler.cxx
index eb33d8e..bd090db 100644
--- a/Source/CTest/cmCTestMultiProcessHandler.cxx
+++ b/Source/CTest/cmCTestMultiProcessHandler.cxx
@@ -121,6 +121,11 @@ void cmCTestMultiProcessHandler::StartTestProcess(int test)
this-RunningCount += GetProcessorsUsed(test);
cmCTestRunTest* testRun = new cmCTestRunTest(this-TestHandler);
+ if(this-CTest-GetRepeatUntilFail())
+{
+testRun-SetRunUntilFailOn();
+testRun-SetNumberOfRuns(this-CTest-GetTestRepeat());
+}
testRun-SetIndex(test);
testRun-SetTestProperties(this-Properties[test]);
@@ -289,7 +294,13 @@ bool cmCTestMultiProcessHandler::CheckOutput()
cmCTestRunTest* p = *i;
int test = p-GetIndex();
-if(p-EndTest(this-Completed, this-Total, true))
+bool testResult = p-EndTest(this-Completed, this-Total, true);
+if(p-StartAgain())
+ {
+ this-Completed--; // remove the completed test because run again
+ continue;
+ }
+if(testResult)
{
this-Passed-push_back(p-GetTestProperties()-Name);
}
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 03131fd..6f72684 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -33,6 +33,9 @@ cmCTestRunTest::cmCTestRunTest(cmCTestTestHandler* handler)
this-CompressedOutput = ;
this-CompressionRatio = 2;
this-StopTimePassed = false;
+ this-NumberOfRunsLeft = 1; // default to 1 run of the test
+ this-RunUntilFail = false; // default to run the test once
+ this-RunAgain = false; // default to not having to run again
}
cmCTestRunTest::~cmCTestRunTest()
@@ -357,13 +360,50 @@ bool cmCTestRunTest::EndTest(size_t completed, size_t
total, bool started)
this-MemCheckPostProcess();
this-ComputeWeightedCost();
}
- // Always push the current TestResult onto the
+ // If the
[Cmake-commits] CMake branch, master, updated. v3.2.1-440-g380db3d
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 380db3de00bd74f01781ea93e9ba9cebdea000cc (commit) from a5cab2e7391df8d2072f1083c075a69bc746c7aa (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=380db3de00bd74f01781ea93e9ba9cebdea000cc commit 380db3de00bd74f01781ea93e9ba9cebdea000cc Author: Kitware Robot kwro...@kitware.com AuthorDate: Wed Mar 18 00:01:04 2015 -0400 Commit: Kitware Robot kwro...@kitware.com CommitDate: Wed Mar 18 00:01:04 2015 -0400 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 35ae8b9..0d92bcf 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 2) -set(CMake_VERSION_PATCH 20150317) +set(CMake_VERSION_PATCH 20150318) #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
Re: [cmake-developers] Introduction and volunteering for the Matlab package
On 17 Mar 2015, at 19:39, Brad King brad.k...@kitware.com wrote: On 03/17/2015 12:28 PM, Raffi Enficiaud wrote: I think everything in http://www.cmake.org/Bug/view.php?id=14641 was addressed. What should the maintainer usually do? I've marked your Mantis account as a developer for CMake and assigned the issue to you. In this case since it's already resolved I went ahead and marked the issue as such already. Future issues with this module may be assigned to you. Thanks, -Brad Very good, and many thanks for your support, Best, Raffi -- 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-commits] CMake branch, next, updated. v3.2.1-1060-g86144dc
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 86144dcd9106990de5c5329f9c8be60d7f329c89 (commit) via 6794079523de41837b43e23128643e6b2c3e9ae7 (commit) via ded79a976e2b63bbfd7a63f27ec00bd071410e27 (commit) from 2753adca6f98c66733498996b2072073823114bf (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=86144dcd9106990de5c5329f9c8be60d7f329c89 commit 86144dcd9106990de5c5329f9c8be60d7f329c89 Merge: 2753adc 6794079 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Mar 17 14:33:02 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Mar 17 14:33:02 2015 -0400 Merge topic 'update-kwiml' into next 67940795 Merge branch 'upstream-kwiml' into update-kwiml ded79a97 KWIML: Teach ABI.h about Xtensa architecture http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6794079523de41837b43e23128643e6b2c3e9ae7 commit 6794079523de41837b43e23128643e6b2c3e9ae7 Merge: a5cab2e ded79a9 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Mar 17 14:27:27 2015 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Mar 17 14:27:27 2015 -0400 Merge branch 'upstream-kwiml' into update-kwiml http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ded79a976e2b63bbfd7a63f27ec00bd071410e27 commit ded79a976e2b63bbfd7a63f27ec00bd071410e27 Author: Max Filippov jcmvb...@gmail.com AuthorDate: Tue Mar 17 15:51:04 2015 +0300 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Mar 17 14:26:20 2015 -0400 KWIML: Teach ABI.h about Xtensa architecture Signed-off-by: Max Filippov jcmvb...@gmail.com diff --git a/ABI.h.in b/ABI.h.in index 21c9139..6300ada 100644 --- a/ABI.h.in +++ b/ABI.h.in @@ -432,6 +432,12 @@ suppression macro @KWIML@_ABI_NO_VERIFY was defined. # define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG # endif +/* Xtensa */ +#elif defined(__XTENSA_EB__) +# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG +#elif defined(__XTENSA_EL__) +# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_LITTLE + /* Unknown CPU */ #elif !defined(@KWIML@_ABI_NO_ERROR_ENDIAN) # error Byte order of target CPU unknown. --- Summary of changes: Utilities/KWIML/ABI.h.in |6 ++ 1 file changed, 6 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, next, updated. v3.2.1-1067-g285a9ac
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 285a9ac82799578706c1ae80dafa33c8eb2c8619 (commit)
via c482c4a4406028e02b90dd2e40f5291a364aa2bb (commit)
from 4dbd32d02224616177686afd8733a4ad03d0c298 (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=285a9ac82799578706c1ae80dafa33c8eb2c8619
commit 285a9ac82799578706c1ae80dafa33c8eb2c8619
Merge: 4dbd32d c482c4a
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Tue Mar 17 17:05:43 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 17 17:05:43 2015 -0400
Merge topic 'ctest-repeat-until-fail' into next
c482c4a4 Pass down the ctest config option to RunCMake tests.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c482c4a4406028e02b90dd2e40f5291a364aa2bb
commit c482c4a4406028e02b90dd2e40f5291a364aa2bb
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Tue Mar 17 17:04:46 2015 -0400
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Tue Mar 17 17:04:46 2015 -0400
Pass down the ctest config option to RunCMake tests.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index ffda31f..9cd2e9a 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -20,6 +20,7 @@ macro(add_RunCMake_test test)
-DRunCMake_MAKE_PROGRAM=${CMake_TEST_EXPLICIT_MAKE_PROGRAM}
-DRunCMake_SOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}
-DRunCMake_BINARY_DIR=${CMAKE_CURRENT_BINARY_DIR}/${test}
+-DRunCMake_CTestTest_CONFIG=${CTestTest_CONFIG}
${${test}_ARGS}
${TEST_ARGS}
-P ${CMAKE_CURRENT_SOURCE_DIR}/${Test_Dir}/RunCMakeTest.cmake
diff --git a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
index 916c7bc..7176e2a 100644
--- a/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake
@@ -16,4 +16,5 @@ set(RunCMake_TEST_OPTIONS -DCMAKE_VERBOSE_MAKEFILE=1)
run_cmake(Build)
unset(RunCMake_TEST_OPTIONS)
run_cmake_command(repeat-until-fail-tests ${CMAKE_CTEST_COMMAND}
+ -C ${RunCMake_CTestTest_CONFIG}
--repeat-until-fail 3 )
---
Summary of changes:
Tests/RunCMake/CMakeLists.txt |1 +
Tests/RunCMake/CTestCommandLine/RunCMakeTest.cmake |1 +
2 files changed, 2 insertions(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
Re: [cmake-developers] Introduction and volunteering for the Matlab package
Le 12/03/15 21:00, Brad King a écrit :
On 03/12/2015 12:35 PM, Raffi Enficiaud wrote:
I will squash all this together once everything is done.
For now please base further work on commit 3743aa11.
We'll see how this does on the nightly testing!
Hi,
I have a problem running the tests on win7. All the tests are passing,
but at the end, I have the following:
17-Mar-2015 04:23:23100% tests passed, 0 tests failed out of 21
17-Mar-2015 04:23:23
17-Mar-2015 04:23:23Total Test time (real) = 21.84 sec
17-Mar-2015 04:23:23 Add file:
D:/bamboo_build_dir/SW-CMAK-JOB1/dashboard/CMakeScripts/findmatlab_nightbuild.cmake
17-Mar-2015 04:23:23 Add file:
D:/bamboo_build_dir/SW-CMAK-JOB1/dashboard/CMakeScripts/cmake_common.cmake
17-Mar-2015 04:23:23 Add file:
D:/bamboo_build_dir/SW-CMAK-JOB1/dashboard/CMakeScripts/findmatlab_nightbuild.cmake
17-Mar-2015 04:23:23 Add file:
D:/bamboo_build_dir/SW-CMAK-JOB1/dashboard/CMakeScripts/kwsys_common.cmake
17-Mar-2015 04:23:23Submit files (using http)
17-Mar-2015 04:23:23 Using HTTP submit method
17-Mar-2015 04:23:23 Drop
site:http://open.cdash.org/submit.php?project=KWSys
17-Mar-2015 04:23:40 Uploaded:
D:/bamboo_build_dir/SW-CMAK-JOB1/dashboard/My
Tests/KWSys-build/Testing/20150317-0100/Build.xml
17-Mar-2015 04:23:44 Uploaded:
D:/bamboo_build_dir/SW-CMAK-JOB1/dashboard/My
Tests/KWSys-build/Testing/20150317-0100/Configure.xml
17-Mar-2015 04:23:49 Uploaded:
D:/bamboo_build_dir/SW-CMAK-JOB1/dashboard/My
Tests/KWSys-build/Testing/20150317-0100/Notes.xml
17-Mar-2015 04:23:53 Uploaded:
D:/bamboo_build_dir/SW-CMAK-JOB1/dashboard/My
Tests/KWSys-build/Testing/20150317-0100/Test.xml
17-Mar-2015 04:23:56 Uploaded:
D:/bamboo_build_dir/SW-CMAK-JOB1/dashboard/My
Tests/KWSys-build/Testing/20150317-0100/Update.xml
17-Mar-2015 04:23:56 Submission successful
17-Mar-2015 04:23:57 Error in read script:
D:/bamboo_build_dir/SW-CMAK-JOB1/dashboard/CMakeScripts/findmatlab_nightbuild.cmake
17-Mar-2015 04:23:57 Failing task since return code of [C:\Program
Files (x86)\CMake 2.8\bin\ctest.exe -S findmatlab_nightbuild.cmake -V]
was -1 while expected 0
The content of the findmatlab_nightbuild.cmake is
set(CTEST_SITE bambooagent.raffienficiaud)
set(CTEST_BUILD_NAME Win7x64-vs2013e-matlab2013b)
set(CTEST_BUILD_CONFIGURATION Debug)
set(CTEST_CMAKE_GENERATOR Visual Studio 12 Win64)
set(dashboard_cache CMake_TEST_FindMatlab:BOOL=ON)
include(${CTEST_SCRIPT_DIRECTORY}/cmake_common.cmake)
and I am using ctest 2.8.12 to run -S findmatlab_nightbuild.cmake -V
Any clue?
Raffi
--
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-commits] CMake branch, next, updated. v3.2.1-1062-gca6f066
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 ca6f06607b0b93781483eaf77c071c1584d32867 (commit)
via f94727a9c2d2a48ecca2297675a7762cdfae460f (commit)
from 86144dcd9106990de5c5329f9c8be60d7f329c89 (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=ca6f06607b0b93781483eaf77c071c1584d32867
commit ca6f06607b0b93781483eaf77c071c1584d32867
Merge: 86144dc f94727a
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Mar 17 14:36:05 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 17 14:36:05 2015 -0400
Merge topic 'mingw-compile-features' into next
f94727a9 Record compile features for GNU on Windows (#15443)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f94727a9c2d2a48ecca2297675a7762cdfae460f
commit f94727a9c2d2a48ecca2297675a7762cdfae460f
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Mar 17 13:31:44 2015 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Mar 17 13:32:08 2015 -0400
Record compile features for GNU on Windows (#15443)
Drop the 'UNIX' condition on GNU compiler features.
Suggested-by: David Demelier demelier.da...@gmail.com
diff --git a/Modules/Compiler/GNU-CXX.cmake b/Modules/Compiler/GNU-CXX.cmake
index 86a31e4..2dc02f0 100644
--- a/Modules/Compiler/GNU-CXX.cmake
+++ b/Modules/Compiler/GNU-CXX.cmake
@@ -44,10 +44,10 @@ macro(cmake_record_cxx_compile_features)
endmacro()
set(_result 0)
- if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.8)
_get_gcc_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION}
CMAKE_CXX14_COMPILE_FEATURES)
endif()
- if (UNIX AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
+ if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.4)
if (_result EQUAL 0)
_get_gcc_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION}
CMAKE_CXX11_COMPILE_FEATURES)
endif()
---
Summary of changes:
Modules/Compiler/GNU-CXX.cmake |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
Re: [cmake-developers] [CMake] Problems with WriteCompilerDetectionHeader and cxx_nullptr
On 03/16/2015 03:05 AM, Roman Wüger wrote: attached is an updated patch. Applied, thanks: WCDH: Fix cxx_nullptr workaround for pre-C++11 compilers http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9d09626 -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-commits] CMake branch, next, updated. v3.2.1-1065-g4dbd32d
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 4dbd32d02224616177686afd8733a4ad03d0c298 (commit)
via 45063cf754673b88dfac19d1017382eedebe50dc (commit)
via 0d7f16649d8eedf2c0ff0c3ae33c11d4fb00b2c6 (commit)
from ca6f06607b0b93781483eaf77c071c1584d32867 (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=4dbd32d02224616177686afd8733a4ad03d0c298
commit 4dbd32d02224616177686afd8733a4ad03d0c298
Merge: ca6f066 45063cf
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Tue Mar 17 14:38:05 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 17 14:38:05 2015 -0400
Merge topic 'ctest-repeat-until-fail' into next
45063cf7 Remove standalone CTest run until fail test.
0d7f1664 Add testing for repeat until fail command line option to ctest.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=45063cf754673b88dfac19d1017382eedebe50dc
commit 45063cf754673b88dfac19d1017382eedebe50dc
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Tue Mar 17 14:36:43 2015 -0400
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Tue Mar 17 14:36:43 2015 -0400
Remove standalone CTest run until fail test.
The test has been moved to the RunCMake style test.
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 4300c7e..08765de 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2583,13 +2583,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
ADD_TEST_MACRO(CTestTestSerialOrder ${CMAKE_CTEST_COMMAND}
--output-on-failure -C \${CTestTest_CONFIG})
- add_test_macro(CTestTestRunUntilFail ${CMAKE_CTEST_COMMAND}
---repeat-until-fail 4 -C \${CTestTest_CONFIG})
- set_tests_properties(CTestTestRunUntilFail PROPERTIES
-PASS_REGULAR_EXPRESSION
-1/2.*Test #1:.* initialization.*Passed.*Test #2.*test1.*Failed
- )
-
if(NOT BORLAND)
set(CTestLimitDashJ_CTEST_OPTIONS --force-new-ctest-process)
add_test_macro(CTestLimitDashJ ${CMAKE_CTEST_COMMAND} -j 4
diff --git a/Tests/CTestTestRunUntilFail/CMakeLists.txt
b/Tests/CTestTestRunUntilFail/CMakeLists.txt
deleted file mode 100644
index 62f4814..000
--- a/Tests/CTestTestRunUntilFail/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-cmake_minimum_required(VERSION 2.8.12)
-project(CTestTestRunUntilFail)
-enable_testing()
-set(TEST_OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/test_output.txt)
-add_test(NAME initialization
- COMMAND ${CMAKE_COMMAND}
- -DTEST_OUTPUT_FILE=${TEST_OUTPUT_FILE}
- -P ${CMAKE_CURRENT_SOURCE_DIR}/init.cmake)
-add_test(NAME test1
- COMMAND ${CMAKE_COMMAND}
- -DTEST_OUTPUT_FILE=${TEST_OUTPUT_FILE}
- -P ${CMAKE_CURRENT_SOURCE_DIR}/test1.cmake)
-set_tests_properties(test1 PROPERTIES DEPENDS initialization)
diff --git a/Tests/CTestTestRunUntilFail/init.cmake
b/Tests/CTestTestRunUntilFail/init.cmake
deleted file mode 100644
index 560fb5e..000
--- a/Tests/CTestTestRunUntilFail/init.cmake
+++ /dev/null
@@ -1 +0,0 @@
-file(WRITE ${TEST_OUTPUT_FILE} 0)
diff --git a/Tests/CTestTestRunUntilFail/test1.cmake
b/Tests/CTestTestRunUntilFail/test1.cmake
deleted file mode 100644
index d7fafb8..000
--- a/Tests/CTestTestRunUntilFail/test1.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-message(TEST_OUTPUT_FILE = ${TEST_OUTPUT_FILE})
-file(READ ${TEST_OUTPUT_FILE} COUNT)
-message(COUNT= ${COUNT})
-math(EXPR COUNT ${COUNT} + 1)
-file(WRITE ${TEST_OUTPUT_FILE} ${COUNT})
-if(${COUNT} EQUAL 2)
- message(FATAL_ERROR this test fails on the 2nd run)
-endif()
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d7f16649d8eedf2c0ff0c3ae33c11d4fb00b2c6
commit 0d7f16649d8eedf2c0ff0c3ae33c11d4fb00b2c6
Author: Bill Hoffman bill.hoff...@kitware.com
AuthorDate: Tue Mar 17 13:51:12 2015 -0400
Commit: Bill Hoffman bill.hoff...@kitware.com
CommitDate: Tue Mar 17 14:04:54 2015 -0400
Add testing for repeat until fail command line option to ctest.
This adds more complete testing. It checks that the output is
as expected when ctest is run on a project with several tests
including one that fails on the second run only.
diff --git a/Tests/RunCMake/CTestCommandLine/Build.cmake
b/Tests/RunCMake/CTestCommandLine/Build.cmake
new file mode 100644
index 000..4654416
--- /dev/null
+++ b/Tests/RunCMake/CTestCommandLine/Build.cmake
@@ -0,0 +1,15 @@
+enable_testing()
+
+set(TEST_OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/test_output.txt)
+add_test(NAME initialization
+ COMMAND ${CMAKE_COMMAND}
+ -DTEST_OUTPUT_FILE=${TEST_OUTPUT_FILE}
+ -P ${CMAKE_CURRENT_SOURCE_DIR}/init.cmake)
+add_test(NAME test1
+
Re: [cmake-developers] [PATCH] Fix FindPackageHandleStandardArgs documentation
On 03/14/2015 05:23 PM, Gregor Jasny wrote: this is my first attempt to practice the topic workflow. I pushed the attached patch to the topic branch and await review before merging to next. The change looks good. Please change the commit message to start in the line FPHSA: Revise documented command signature We use the FPHSA: prefix for changes to that module. Then force-push the topic back to the stage and merge to 'next', please. 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] Introduction and volunteering for the Matlab package
On 03/17/2015 12:28 PM, Raffi Enficiaud wrote: I think everything in http://www.cmake.org/Bug/view.php?id=14641 was addressed. What should the maintainer usually do? I've marked your Mantis account as a developer for CMake and assigned the issue to you. In this case since it's already resolved I went ahead and marked the issue as such already. Future issues with this module may be assigned to you. 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] file glob and glob recurse directory listing difference
On 03/15/2015 06:37 PM, Domen Vrankar wrote: Alternative would be to define LIST_DIRECTORIES for GLOB_RECURSE only and preserve back compatibility that way - maybe also define NO_DIRECTORY_LISTING for GLOB just for the sake of consistency. Let's just define both options for both commands so that it can always be explicitly specified. 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
[Cmake-commits] CMake branch, next, updated. v3.2.1-1057-g2753adc
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 2753adca6f98c66733498996b2072073823114bf (commit)
via f9d09626899a8196a2f46992585ddff21fd2de34 (commit)
from 8a82bf6a83fa1d9c3c53cc5373cc793366d6b954 (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=2753adca6f98c66733498996b2072073823114bf
commit 2753adca6f98c66733498996b2072073823114bf
Merge: 8a82bf6 f9d0962
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Mar 17 14:10:33 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 17 14:10:33 2015 -0400
Merge topic 'WCDH-fix-cxx_nullptr-workaround' into next
f9d09626 WCDH: Fix cxx_nullptr workaround for pre-C++11 compilers
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f9d09626899a8196a2f46992585ddff21fd2de34
commit f9d09626899a8196a2f46992585ddff21fd2de34
Author: Roman Wüger roman.wue...@gmx.at
AuthorDate: Fri Mar 13 09:18:19 2015 +0100
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Mar 17 13:46:43 2015 -0400
WCDH: Fix cxx_nullptr workaround for pre-C++11 compilers
Use just '0' instead of 'static_castvoid*(0)' because the latter
will not automatically convert to pointers to other types.
diff --git a/Modules/WriteCompilerDetectionHeader.cmake
b/Modules/WriteCompilerDetectionHeader.cmake
index d18f47c..f4dcb21 100644
--- a/Modules/WriteCompilerDetectionHeader.cmake
+++ b/Modules/WriteCompilerDetectionHeader.cmake
@@ -586,7 +586,7 @@ function(write_compiler_detection_header
# if ${def_name}
#define ${def_value} nullptr
# else
-#define ${def_value} static_castvoid*(0)
+#define ${def_value} 0
# endif
\n)
endif()
---
Summary of changes:
Modules/WriteCompilerDetectionHeader.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
[Cmake-commits] CMake branch, next, updated. v3.2.1-1069-g3eb856c
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 3eb856c1332775686b6003ba2c05c033dbd7ac47 (commit)
via 16aa38f15b98089da59f7cd4cd83aeb1ac6214a2 (commit)
from 285a9ac82799578706c1ae80dafa33c8eb2c8619 (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=3eb856c1332775686b6003ba2c05c033dbd7ac47
commit 3eb856c1332775686b6003ba2c05c033dbd7ac47
Merge: 285a9ac 16aa38f
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Tue Mar 17 18:35:27 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 17 18:35:27 2015 -0400
Merge topic 'glob_recurse_handle_cyclic_recursion' into next
16aa38f1 file GLOB list directories handling
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=16aa38f15b98089da59f7cd4cd83aeb1ac6214a2
commit 16aa38f15b98089da59f7cd4cd83aeb1ac6214a2
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Tue Mar 17 23:34:03 2015 +0100
Commit: Domen Vrankar domen.vran...@gmail.com
CommitDate: Tue Mar 17 23:34:03 2015 +0100
file GLOB list directories handling
GLOB lists directories by default and
GLOB_RECURSE does not. LIST_DIRECTORIES
enables user to control the behavior
explicitly for consistently for both
GLOB and GLOB_RECURSE.
diff --git a/Help/command/file.rst b/Help/command/file.rst
index 73d4cfa..bcecb64 100644
--- a/Help/command/file.rst
+++ b/Help/command/file.rst
@@ -92,8 +92,8 @@ store it in a ``variable``.
::
- file(GLOB variable [RELATIVE path] [globbing-expressions...])
- file(GLOB_RECURSE variable [RELATIVE path]
+ file(GLOB variable [LIST_DIRECTORIES true|false] [RELATIVE path]
[globbing-expressions...])
+ file(GLOB_RECURSE variable [LIST_DIRECTORIES true|false] [RELATIVE path]
[FOLLOW_SYMLINKS] [globbing-expressions...])
Generate a list of files that match the ``globbing-expressions`` and
@@ -102,6 +102,9 @@ regular expressions, but much simpler. If ``RELATIVE``
flag is
specified, the results will be returned as relative paths to the given
path.
+By default ``GLOB`` lists directories - directories are omited in result if
+``LIST_DIRECTORIES`` is set to false.
+
.. note::
We do not recommend using GLOB to collect a list of source files from
your source tree. If no CMakeLists.txt file changes when a source is
@@ -119,6 +122,11 @@ matched directory and match the files. Subdirectories
that are symlinks
are only traversed if ``FOLLOW_SYMLINKS`` is given or policy
:policy:`CMP0009` is not set to ``NEW``.
+By default ``GLOB_RECURSE`` omits directories from result list - setting
+``LIST_DIRECTORIES`` to true adds directories to result list.
+If ``FOLLOW_SYMLINKS`` is given or policy :policy:`CMP0009` is not set to
+``OLD`` then ``LIST_DIRECTORIES`` treats symlinks as directories.
+
Examples of recursive globbing include::
/dir/*.py - match all python files in /dir and subdirectories
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx
index ec22ea0..ae9099e 100644
--- a/Source/cmFileCommand.cxx
+++ b/Source/cmFileCommand.cxx
@@ -920,6 +920,35 @@ bool
cmFileCommand::HandleGlobCommand(std::vectorstd::string const args,
bool first = true;
for ( ; i != args.end(); ++i )
{
+if( *i == LIST_DIRECTORIES )
+ {
+ ++i;
+ if(i != args.end())
+{
+if(cmSystemTools::IsOn(i-c_str()))
+ {
+ g.SetListDirs(true);
+ g.SetRecurseListDirs(true);
+ }
+else if(cmSystemTools::IsOff(i-c_str()))
+ {
+ g.SetListDirs(false);
+ g.SetRecurseListDirs(false);
+ }
+else
+ {
+ this-SetError(LIST_DIRECTORIES missing bool value.);
+ return false;
+ }
+}
+ else
+{
+this-SetError(LIST_DIRECTORIES missing bool value.);
+return false;
+}
+ ++i;
+ }
+
if ( recurse (*i == FOLLOW_SYMLINKS) )
{
explicitFollowSymlinks = true;
@@ -950,6 +979,7 @@ bool
cmFileCommand::HandleGlobCommand(std::vectorstd::string const args,
}
}
+cmsys::Glob::GlobMessages globMessages;
if ( !cmsys::SystemTools::FileIsFullPath(i-c_str()) )
{
std::string expr = this-Makefile-GetCurrentDirectory();
@@ -957,16 +987,42 @@ bool
cmFileCommand::HandleGlobCommand(std::vectorstd::string const args,
if (!expr.empty())
{
expr += / + *i;
-g.FindFiles(expr);
+g.FindFiles(expr, globMessages);
}
else
{
-g.FindFiles(*i);
+g.FindFiles(*i, globMessages);
}
Re: [cmake-developers] [PATCH] ABI.h.in: add support for Xtensa architecture
On 03/17/2015 08:51 AM, Max Filippov wrote: Signed-off-by: Max Filippov jcmvb...@gmail.com Thanks, applied: KWIML: Teach ABI.h about Xtensa architecture http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ded79a97 Merge branch 'upstream-kwiml' into update-kwiml http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=67940795 -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 v8 0/5] Add XCTest Bundle Support
On 03/14/2015 03:03 PM, Gregor Jasny wrote:
I changed it into a Find module and it looks much more polished
now.
Great.
I fully agree that modifying the testee is not something one would
expect when adding a test for it. Therefore I reverted the rpath
setting for Frameworks and replaced it with a DYLD environment
variable when calling xctest. For the App Bundle I reverted your
ENABLE_EXPORTS call and replaced it with Xcode specific settings
for the XCODE generator and a linker flag for the Makefile generator.
Okay.
+ target_link_libraries(${target}
+PRIVATE -bundle_loader $TARGET_FILE:${testee})
Please try using this in a CMake source/build tree each with spaces
in the path. Quoting may need updating; perhaps:
target_link_libraries(${target}
PRIVATE -bundle_loader $TARGET_FILE:${testee})
Once you ACK the series I will create a topic branch and follow
the developer instructions.
Please proceed.
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
[cmake-developers] [PATCH] ABI.h.in: add support for Xtensa architecture
Signed-off-by: Max Filippov jcmvb...@gmail.com --- Utilities/KWIML/ABI.h.in | 6 ++ 1 file changed, 6 insertions(+) diff --git a/Utilities/KWIML/ABI.h.in b/Utilities/KWIML/ABI.h.in index 21c9139..6300ada 100644 --- a/Utilities/KWIML/ABI.h.in +++ b/Utilities/KWIML/ABI.h.in @@ -432,6 +432,12 @@ suppression macro @KWIML@_ABI_NO_VERIFY was defined. # define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG # endif +/* Xtensa */ +#elif defined(__XTENSA_EB__) +# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_BIG +#elif defined(__XTENSA_EL__) +# define @KWIML@_ABI_ENDIAN_ID @KWIML@_ABI_ENDIAN_ID_LITTLE + /* Unknown CPU */ #elif !defined(@KWIML@_ABI_NO_ERROR_ENDIAN) # error Byte order of target CPU unknown. -- 1.8.1.4 -- 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 0015451]: Setting MAP_IMPORTED_CONFIG_CONFIG hides IMPORTED_LOCATION
The following issue has been SUBMITTED.
==
http://public.kitware.com/Bug/view.php?id=15451
==
Reported By:Bjoern Thiel
Assigned To:
==
Project:CMake
Issue ID: 15451
Category: CMake
Reproducibility:always
Severity: major
Priority: normal
Status: new
==
Date Submitted: 2015-03-17 07:30 EDT
Last Modified: 2015-03-17 07:30 EDT
==
Summary:Setting MAP_IMPORTED_CONFIG_CONFIG hides
IMPORTED_LOCATION
Description:
I thought IMPORTED_LOCATION is a fall back for IMPORTED_LOCATION_CONFIG and
should be found in any case. But cmTarget::GetMappedConfig gives up too early:
if(!mappedConfigs.empty() !*loc !*imp) { return false; } (line 5540)
Example: set(CMAKE_MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELEASE) and try to use
Qt5::moc in the RelWithDebInfo configuration.
Steps to Reproduce:
See above.
==
Issue History
Date ModifiedUsername FieldChange
==
2015-03-17 07:30 Bjoern Thiel 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
[Cmake-commits] CMake branch, next, updated. v3.2.1-1033-g100f5b6
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 100f5b6c1f44e7b49f0e95e6b4e9f18e4599b05f (commit) via 49c8dcf7bb8ae9e7584286e552769a61bf23e61b (commit) from 21d33bf37b0a254b68a3dbaaeb085970503b52d8 (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=100f5b6c1f44e7b49f0e95e6b4e9f18e4599b05f commit 100f5b6c1f44e7b49f0e95e6b4e9f18e4599b05f Merge: 21d33bf 49c8dcf Author: Brad King brad.k...@kitware.com AuthorDate: Tue Mar 17 09:52:52 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Mar 17 09:52:52 2015 -0400 Merge topic 'FindMatlab-rewrite' into next 49c8dcf7 FindMatlab: Rewrite module and provide a usage API http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49c8dcf7bb8ae9e7584286e552769a61bf23e61b commit 49c8dcf7bb8ae9e7584286e552769a61bf23e61b Author: Raffi Enficiaud raffi.enfici...@tuebingen.mpg.de AuthorDate: Thu Feb 12 17:13:31 2015 +0100 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Mar 17 09:47:04 2015 -0400 FindMatlab: Rewrite module and provide a usage API Implement a brand new FindMatlab module: - Add support for versions and components. - Find Matlab and its version in a more precise and multiplatform way. - Add API to create a new mex extension with documentation. - Add API to add matlab unit tests (with or without the unit test framework). - Find as much as possible based on a single Matlab_ROOT_DIR cache entry and allow the user to change it to re-find everything. diff --git a/Help/release/dev/FindMatlab-rewrite.rst b/Help/release/dev/FindMatlab-rewrite.rst new file mode 100644 index 000..07727b8 --- /dev/null +++ b/Help/release/dev/FindMatlab-rewrite.rst @@ -0,0 +1,7 @@ +FindMatlab-rewrite +-- + +* The :module:`FindMatlab` module was completely rewritten. It learned + about versions and components and to find Matlab in a more precise and + multiplatform way. The module now offers APIs to create mex extensions, + documentation, and unit tests. diff --git a/Modules/FindMatlab.cmake b/Modules/FindMatlab.cmake index 73b3a5b..d08423b 100644 --- a/Modules/FindMatlab.cmake +++ b/Modules/FindMatlab.cmake @@ -2,20 +2,208 @@ # FindMatlab # -- # -# this module looks for Matlab +# Finds Matlab installations and provides Matlab tools and libraries to cmake. # -# Defines: +# This package first intention is to find the libraries associated with Matlab +# in order to be able to build Matlab extensions (mex files). It can also be +# used: # -# :: +# * run specific commands in Matlab +# * declare Matlab unit test +# * retrieve various information from Matlab (mex extensions, versions and +# release queries, ...) # -# MATLAB_INCLUDE_DIR: include path for mex.h, engine.h -# MATLAB_LIBRARIES: required libraries: libmex, etc -# MATLAB_MEX_LIBRARY: path to libmex.lib -# MATLAB_MX_LIBRARY: path to libmx.lib -# MATLAB_ENG_LIBRARY: path to libeng.lib +# The module supports the following components: +# +# * ``MX_LIBRARY`` and ``ENG_LIBRARY`` respectively the MX and ENG libraries of +# Matlab +# * ``MAIN_PROGRAM`` the Matlab binary program. +# +# .. note:: +# +# The version given to the :command:`find_package` directive is the Matlab +# **version**, which should not be confused with the Matlab *release* name +# (eg. `R2014`). +# The :command:`matlab_get_version_from_release_name` and +# :command:`matlab_get_release_name_from_version` allow a mapping +# from the release name to the version. +# +# The variable :variable:`Matlab_ROOT_DIR` may be specified in order to give +# the path of the desired Matlab version. Otherwise, the behaviour is platform +# specific: +# +# * Windows: The installed versions of Matlab are retrieved from the +# Windows registry +# * OS X: The installed versions of Matlab are given by the MATLAB +# paths in ``/Application``. If no such application is found, it falls back +# to the one that might be accessible from the PATH. +# * Unix: The desired Matlab should be accessible from the PATH. +# +# Additional information is provided when :variable:`MATLAB_FIND_DEBUG` is set. +# When a Matlab binary is found automatically and the ``MATLAB_VERSION`` +# is not given, the version is queried from Matlab directly. +# On Windows, it can make a window running Matlab appear. +# +# The mapping of the release names and the version of Matlab is performed by +# defining pairs (name, version). The variable +# :variable:`MATLAB_ADDITIONAL_VERSIONS` may be provided before the call to +# the :command:`find_package` in order to
[Cmake-commits] CMake branch, next, updated. v3.2.1-1035-g987430c
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 987430c70a226a5dcf88d04c3d1ab75ac1b142f4 (commit)
via 5bc304f7fa8e3db252e2c469f9df0204853163cc (commit)
from 100f5b6c1f44e7b49f0e95e6b4e9f18e4599b05f (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=987430c70a226a5dcf88d04c3d1ab75ac1b142f4
commit 987430c70a226a5dcf88d04c3d1ab75ac1b142f4
Merge: 100f5b6 5bc304f
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Mar 17 10:11:24 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 17 10:11:24 2015 -0400
Merge topic 'output-ctest-env-vars' into next
5bc304f7 fixup! CTest: Output test-specific env vars in verbose mode
(#15446)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5bc304f7fa8e3db252e2c469f9df0204853163cc
commit 5bc304f7fa8e3db252e2c469f9df0204853163cc
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Mar 17 10:11:05 2015 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Mar 17 10:11:05 2015 -0400
fixup! CTest: Output test-specific env vars in verbose mode (#15446)
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index c4e4d5c..c755651 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2565,7 +2565,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
${CMake_BINARY_DIR}/Tests/CTestTestVerboseOutput/test.cmake @ONLY
ESCAPE_QUOTES)
add_test(CTestTestVerboseOutput ${CMAKE_CTEST_COMMAND}
-S ${CMake_BINARY_DIR}/Tests/CTestTestVerboseOutput/test.cmake -VV
---output-log ${CMake_BINARY_DIR}/Tests/CTestTest2/testOutput.log
+--output-log
${CMake_BINARY_DIR}/Tests/CTestTestVerboseOutput/testOutput.log
-C \${CTestTest_CONFIG}
)
set_property(TEST CTestTestVerboseOutput PROPERTY PASS_REGULAR_EXPRESSION
---
Summary of changes:
Tests/CMakeLists.txt |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
[Cmake-commits] CMake branch, next, updated. v3.2.1-1037-gb80194b
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 b80194b8302ef3eb1c205008f238ead50f34d50d (commit)
via 874fdd914a646d25096c34b97caafe43e2a77748 (commit)
from 987430c70a226a5dcf88d04c3d1ab75ac1b142f4 (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=b80194b8302ef3eb1c205008f238ead50f34d50d
commit b80194b8302ef3eb1c205008f238ead50f34d50d
Merge: 987430c 874fdd9
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Mar 17 10:12:05 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 17 10:12:05 2015 -0400
Merge topic 'output-ctest-env-vars' into next
874fdd91 CTest: Output test-specific env vars in verbose mode (#15446)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=874fdd914a646d25096c34b97caafe43e2a77748
commit 874fdd914a646d25096c34b97caafe43e2a77748
Author: Zach Mullen zach.mul...@kitware.com
AuthorDate: Sun Mar 15 13:00:31 2015 -0400
Commit: Brad King brad.k...@kitware.com
CommitDate: Tue Mar 17 10:11:33 2015 -0400
CTest: Output test-specific env vars in verbose mode (#15446)
Any environment vars that were configured for a test via the
ENVIRONMENT property will now be output when the test is run
with verbose logging enabled.
diff --git a/Source/CTest/cmCTestRunTest.cxx b/Source/CTest/cmCTestRunTest.cxx
index 03131fd..01a7884 100644
--- a/Source/CTest/cmCTestRunTest.cxx
+++ b/Source/CTest/cmCTestRunTest.cxx
@@ -536,11 +536,26 @@ void cmCTestRunTest::ComputeArguments()
}
this-TestResult.FullCommandLine = testCommand;
+ // Print the test command in verbose mode
cmCTestLog(this-CTest, HANDLER_VERBOSE_OUTPUT, std::endl
this-Index :
(this-TestHandler-MemCheck?MemCheck:Test)
command: testCommand
std::endl);
+
+ // Print any test-specific env vars in verbose mode
+ if (this-TestProperties-Environment.size())
+{
+cmCTestLog(this-CTest, HANDLER_VERBOSE_OUTPUT, this-Index :
+Environment variables: std::endl);
+}
+ for(std::vectorstd::string::const_iterator e =
+ this-TestProperties-Environment.begin();
+ e != this-TestProperties-Environment.end(); ++e)
+{
+cmCTestLog(this-CTest, HANDLER_VERBOSE_OUTPUT, this-Index :*e
+std::endl);
+}
}
//--
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 703c548..c755651 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2561,6 +2561,17 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P
${CMake_SOURCE_DIR}/Utilities/Release
--output-log ${CMake_BINARY_DIR}/Tests/CTestTestParallel/testOutput.log
)
+
configure_file(${CMake_SOURCE_DIR}/Tests/CTestTestVerboseOutput/test.cmake.in
+${CMake_BINARY_DIR}/Tests/CTestTestVerboseOutput/test.cmake @ONLY
ESCAPE_QUOTES)
+ add_test(CTestTestVerboseOutput ${CMAKE_CTEST_COMMAND}
+-S ${CMake_BINARY_DIR}/Tests/CTestTestVerboseOutput/test.cmake -VV
+--output-log
${CMake_BINARY_DIR}/Tests/CTestTestVerboseOutput/testOutput.log
+-C \${CTestTest_CONFIG}
+)
+ set_property(TEST CTestTestVerboseOutput PROPERTY PASS_REGULAR_EXPRESSION
+Environment variables:.*foo=bar.*this=that
+ )
+
configure_file(
${CMake_SOURCE_DIR}/Tests/CTestTestSkipReturnCode/test.cmake.in
${CMake_BINARY_DIR}/Tests/CTestTestSkipReturnCode/test.cmake
diff --git a/Tests/CTestTestVerboseOutput/CMakeLists.txt
b/Tests/CTestTestVerboseOutput/CMakeLists.txt
new file mode 100644
index 000..4cdd29c
--- /dev/null
+++ b/Tests/CTestTestVerboseOutput/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required (VERSION 2.6)
+project(CTestTestVerboseOutput)
+include(CTest)
+
+add_executable(nop nop.c)
+
+add_test(NAME TestWithProperties COMMAND nop)
+set_property(TEST TestWithProperties PROPERTY ENVIRONMENT
+ foo=bar
+ this=that
+)
diff --git a/Tests/CTestTestVerboseOutput/CTestConfig.cmake
b/Tests/CTestTestVerboseOutput/CTestConfig.cmake
new file mode 100644
index 000..4f96c79
--- /dev/null
+++ b/Tests/CTestTestVerboseOutput/CTestConfig.cmake
@@ -0,0 +1,7 @@
+set(CTEST_PROJECT_NAME CTestTestVerboseOutput)
+set(CTEST_NIGHTLY_START_TIME 21:00:00 EDT)
+set(CTEST_DART_SERVER_VERSION 2)
+set(CTEST_DROP_METHOD http)
+set(CTEST_DROP_SITE open.cdash.org)
+set(CTEST_DROP_LOCATION /submit.php?project=PublicDashboard)
+set(CTEST_DROP_SITE_CDASH TRUE)
diff --git a/Tests/CTestTestVerboseOutput/nop.c
b/Tests/CTestTestVerboseOutput/nop.c
new file mode 100644
index 000..f8b643a
--- /dev/null
+++
[Cmake-commits] CMake branch, master, updated. v3.2.1-437-g0320993
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 03209934560329aebd75dc74916e236e3b5c9b74 (commit) via 140a53a810ea7449c26e6e572918df3bb20e86d1 (commit) via 4552bc886d1bd8966f6ef2f7790835dfdb2e6d8b (commit) from 8915cddcde6f8b0946e54f1cd6c9b8434bf4fd14 (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=03209934560329aebd75dc74916e236e3b5c9b74 commit 03209934560329aebd75dc74916e236e3b5c9b74 Merge: 8915cdd 140a53a Author: Brad King brad.k...@kitware.com AuthorDate: Tue Mar 17 10:14:54 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Mar 17 10:14:54 2015 -0400 Merge topic 'cpack_rpm_old_version_tests' 140a53a8 CPack/RPM architecture test fixup 4552bc88 CPack/RPM relocation paths test fixup --- Summary of changes: .../RunCPackVerifyResult.cmake | 41 +++- 1 file changed, 31 insertions(+), 10 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.2.1-432-ge9072d2
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 e9072d26c0d90a8ff521d46347e5d1b3555f8099 (commit)
via 874fdd914a646d25096c34b97caafe43e2a77748 (commit)
from 4fb9abc5629ee5c046292adc77b2583ffc15c230 (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=e9072d26c0d90a8ff521d46347e5d1b3555f8099
commit e9072d26c0d90a8ff521d46347e5d1b3555f8099
Merge: 4fb9abc 874fdd9
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Mar 17 10:14:49 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 17 10:14:49 2015 -0400
Merge topic 'output-ctest-env-vars'
874fdd91 CTest: Output test-specific env vars in verbose mode (#15446)
---
Summary of changes:
Source/CTest/cmCTestRunTest.cxx | 15 +++
Tests/CMakeLists.txt| 11 +++
Tests/CTestTestVerboseOutput/CMakeLists.txt | 11 +++
.../CTestConfig.cmake |2 +-
.../CTestTestVerboseOutput/nop.c|0
.../test.cmake.in} | 13 ++---
6 files changed, 44 insertions(+), 8 deletions(-)
create mode 100644 Tests/CTestTestVerboseOutput/CMakeLists.txt
copy Tests/{CTestTestScheduler = CTestTestVerboseOutput}/CTestConfig.cmake
(83%)
copy Modules/DummyCXXFile.cxx = Tests/CTestTestVerboseOutput/nop.c (100%)
copy Tests/{CTestTestFailure/testNoExe.cmake.in =
CTestTestVerboseOutput/test.cmake.in} (72%)
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.2.1-439-ga5cab2e
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 a5cab2e7391df8d2072f1083c075a69bc746c7aa (commit) via 1bda8f1fdbfdeef82766e5db542b1946d5e2167d (commit) from 03209934560329aebd75dc74916e236e3b5c9b74 (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=a5cab2e7391df8d2072f1083c075a69bc746c7aa commit a5cab2e7391df8d2072f1083c075a69bc746c7aa Merge: 0320993 1bda8f1 Author: Brad King brad.k...@kitware.com AuthorDate: Tue Mar 17 10:14:56 2015 -0400 Commit: CMake Topic Stage kwro...@kitware.com CommitDate: Tue Mar 17 10:14:56 2015 -0400 Merge topic 'wix-installer-theme' 1bda8f1f CPackWIX: Customize CMake installer theme. --- Summary of changes: CMakeCPackOptions.cmake.in|8 Utilities/Release/cpack_wix_ui_banner.jpg | Bin 0 - 2607 bytes Utilities/Release/cpack_wix_ui_dialog.jpg | Bin 0 - 13369 bytes 3 files changed, 8 insertions(+) create mode 100644 Utilities/Release/cpack_wix_ui_banner.jpg create mode 100644 Utilities/Release/cpack_wix_ui_dialog.jpg 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.2.1-434-g8915cdd
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 8915cddcde6f8b0946e54f1cd6c9b8434bf4fd14 (commit)
via 49c8dcf7bb8ae9e7584286e552769a61bf23e61b (commit)
from e9072d26c0d90a8ff521d46347e5d1b3555f8099 (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=8915cddcde6f8b0946e54f1cd6c9b8434bf4fd14
commit 8915cddcde6f8b0946e54f1cd6c9b8434bf4fd14
Merge: e9072d2 49c8dcf
Author: Brad King brad.k...@kitware.com
AuthorDate: Tue Mar 17 10:14:52 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 17 10:14:52 2015 -0400
Merge topic 'FindMatlab-rewrite'
49c8dcf7 FindMatlab: Rewrite module and provide a usage API
---
Summary of changes:
Help/release/dev/FindMatlab-rewrite.rst|7 +
Modules/FindMatlab.cmake | 1508 ++--
Modules/MatlabTestsRedirect.cmake | 92 ++
Tests/CMakeLists.txt |6 +
Tests/FindMatlab/basic_checks/CMakeLists.txt | 57 +
Tests/FindMatlab/cmake_matlab_unit_tests1.m| 33 +
Tests/FindMatlab/cmake_matlab_unit_tests2.m|6 +
Tests/FindMatlab/cmake_matlab_unit_tests3.m|5 +
Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m | 16 +
Tests/FindMatlab/help_text1.m.txt |2 +
Tests/FindMatlab/matlab_wrapper1.cpp | 26 +
Tests/FindMatlab/versions_checks/CMakeLists.txt| 52 +
Tests/RunCMake/CMakeLists.txt |5 +
.../{CMP0038 = FindMatlab}/CMakeLists.txt |2 +-
.../MatlabTest1-result.txt}|0
Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt |2 +
Tests/RunCMake/FindMatlab/MatlabTest1.cmake| 22 +
Tests/RunCMake/FindMatlab/RunCMakeTest.cmake |3 +
.../RunCMake/FindMatlab/cmake_matlab_unit_tests2.m |6 +
Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp | 26 +
20 files changed, 1788 insertions(+), 88 deletions(-)
create mode 100644 Help/release/dev/FindMatlab-rewrite.rst
create mode 100644 Modules/MatlabTestsRedirect.cmake
create mode 100644 Tests/FindMatlab/basic_checks/CMakeLists.txt
create mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests1.m
create mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests2.m
create mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests3.m
create mode 100644 Tests/FindMatlab/cmake_matlab_unit_tests_timeout.m
create mode 100644 Tests/FindMatlab/help_text1.m.txt
create mode 100644 Tests/FindMatlab/matlab_wrapper1.cpp
create mode 100644 Tests/FindMatlab/versions_checks/CMakeLists.txt
copy Tests/RunCMake/{CMP0038 = FindMatlab}/CMakeLists.txt (70%)
copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt =
FindMatlab/MatlabTest1-result.txt} (100%)
create mode 100644 Tests/RunCMake/FindMatlab/MatlabTest1-stderr.txt
create mode 100644 Tests/RunCMake/FindMatlab/MatlabTest1.cmake
create mode 100644 Tests/RunCMake/FindMatlab/RunCMakeTest.cmake
create mode 100644 Tests/RunCMake/FindMatlab/cmake_matlab_unit_tests2.m
create mode 100644 Tests/RunCMake/FindMatlab/matlab_wrapper1.cpp
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.2.1-1044-gffcab9b
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 ffcab9ba5822eec95d349d937b5cb11e7ca7c2a1 (commit) via a5cab2e7391df8d2072f1083c075a69bc746c7aa (commit) via 03209934560329aebd75dc74916e236e3b5c9b74 (commit) via 8915cddcde6f8b0946e54f1cd6c9b8434bf4fd14 (commit) via e9072d26c0d90a8ff521d46347e5d1b3555f8099 (commit) via 4fb9abc5629ee5c046292adc77b2583ffc15c230 (commit) via 0ac7d871fae9589bbdf22518360818f9b1423bd8 (commit) from b80194b8302ef3eb1c205008f238ead50f34d50d (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=ffcab9ba5822eec95d349d937b5cb11e7ca7c2a1 commit ffcab9ba5822eec95d349d937b5cb11e7ca7c2a1 Merge: b80194b a5cab2e Author: Brad King brad.k...@kitware.com AuthorDate: Tue Mar 17 10:15:08 2015 -0400 Commit: Brad King brad.k...@kitware.com CommitDate: Tue Mar 17 10:15:08 2015 -0400 Merge branch 'master' into next --- 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
[Cmake-commits] CMake branch, next, updated. v3.2.1-1055-g8a82bf6
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 8a82bf6a83fa1d9c3c53cc5373cc793366d6b954 (commit)
via be089724e943da786c35fddceb8d9b0e7a9fb2f5 (commit)
via ffc1b9451070d9da5860533da8c19c75583e5661 (commit)
from 13af2b0fdf0695e57434a1280a3516639923d19c (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=8a82bf6a83fa1d9c3c53cc5373cc793366d6b954
commit 8a82bf6a83fa1d9c3c53cc5373cc793366d6b954
Merge: 13af2b0 be08972
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Tue Mar 17 12:41:23 2015 -0400
Commit: CMake Topic Stage kwro...@kitware.com
CommitDate: Tue Mar 17 12:41:23 2015 -0400
Merge topic 'cpack_rpm_component_fall_through' into next
be089724 CPack/RPM prevent component attributes leakage
ffc1b945 CPack/RPM improved component override test
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=be089724e943da786c35fddceb8d9b0e7a9fb2f5
commit be089724e943da786c35fddceb8d9b0e7a9fb2f5
Author: Domen Vrankar domen.vran...@gmail.com
AuthorDate: Mon Mar 16 22:17:17 2015 +0100
Commit: Domen Vrankar domen.vran...@gmail.com
CommitDate: Tue Mar 17 17:36:36 2015 +0100
CPack/RPM prevent component attributes leakage
Fixes mantis bug report with id 15169. Some
component specific attributes were leaking
to next component. Leakage handling was
implemented in different locations but there
were still attributes that leaked. Patch
encapsulates generator into function so all
current leaks are fixed and no future leaks
can occur.
diff --git a/Modules/CPackRPM.cmake b/Modules/CPackRPM.cmake
index fce8236..539a0aa 100644
--- a/Modules/CPackRPM.cmake
+++ b/Modules/CPackRPM.cmake
@@ -494,709 +494,687 @@ if(NOT UNIX)
message(FATAL_ERROR CPackRPM.cmake may only be used under UNIX.)
endif()
-# rpmbuild is the basic command for building RPM package
-# it may be a simple (symbolic) link to rpm command.
-find_program(RPMBUILD_EXECUTABLE rpmbuild)
-
-# Check version of the rpmbuild tool this would be easier to
-# track bugs with users and CPackRPM debug mode.
-# We may use RPM version in order to check for available version dependent
features
-if(RPMBUILD_EXECUTABLE)
- execute_process(COMMAND ${RPMBUILD_EXECUTABLE} --version
- OUTPUT_VARIABLE _TMP_VERSION
- ERROR_QUIET
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- string(REGEX REPLACE ^.*
- RPMBUILD_EXECUTABLE_VERSION
- ${_TMP_VERSION})
- if(CPACK_RPM_PACKAGE_DEBUG)
-message(CPackRPM:Debug: rpmbuild version is
${RPMBUILD_EXECUTABLE_VERSION})
- endif()
-endif()
-
-if(NOT RPMBUILD_EXECUTABLE)
- message(FATAL_ERROR RPM package requires rpmbuild executable)
-endif()
-
-# Display lsb_release output if DEBUG mode enable
-# This will help to diagnose problem with CPackRPM
-# because we will know on which kind of Linux we are
-if(CPACK_RPM_PACKAGE_DEBUG)
- find_program(LSB_RELEASE_EXECUTABLE lsb_release)
- if(LSB_RELEASE_EXECUTABLE)
-execute_process(COMMAND ${LSB_RELEASE_EXECUTABLE} -a
-OUTPUT_VARIABLE _TMP_LSB_RELEASE_OUTPUT
+function(cpack_rpm_generate_package)
+ # rpmbuild is the basic command for building RPM package
+ # it may be a simple (symbolic) link to rpm command.
+ find_program(RPMBUILD_EXECUTABLE rpmbuild)
+
+ # Check version of the rpmbuild tool this would be easier to
+ # track bugs with users and CPackRPM debug mode.
+ # We may use RPM version in order to check for available version dependent
features
+ if(RPMBUILD_EXECUTABLE)
+execute_process(COMMAND ${RPMBUILD_EXECUTABLE} --version
+OUTPUT_VARIABLE _TMP_VERSION
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE)
-string(REGEX REPLACE \n ,
- LSB_RELEASE_OUTPUT
- ${_TMP_LSB_RELEASE_OUTPUT})
- else ()
-set(LSB_RELEASE_OUTPUT lsb_release not installed/found!)
+string(REGEX REPLACE ^.*
+ RPMBUILD_EXECUTABLE_VERSION
+ ${_TMP_VERSION})
+if(CPACK_RPM_PACKAGE_DEBUG)
+ message(CPackRPM:Debug: rpmbuild version is
${RPMBUILD_EXECUTABLE_VERSION})
+endif()
endif()
- message(CPackRPM:Debug: LSB_RELEASE = ${LSB_RELEASE_OUTPUT})
-endif()
-
-# We may use RPM version in the future in order
-# to shut down warning about space in buildtree
-# some recent RPM version should support space in different places.
-# not checked [yet].
-if(CPACK_TOPLEVEL_DIRECTORY MATCHES .* .*)
- message(FATAL_ERROR ${RPMBUILD_EXECUTABLE} can't handle paths with spaces,
use a build directory without spaces for building RPMs.)
Re: [cmake-developers] Introduction and volunteering for the Matlab package
On 17 Mar 2015, at 16:25, Brad King brad.k...@kitware.com wrote: Nothing right now! I've squashed this all into one commit: FindMatlab: Rewrite module and provide a usage API http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=49c8dcf7 and merged to 'master' for inclusion in 3.3. Thanks for all your work on this and persistence with following up on feedback. This is a huge improvement over the previous FindMatlab module. -Brad I am happy that it worked! I think everything in http://www.cmake.org/Bug/view.php?id=14641 was addressed. What should the maintainer usually do? Best, Raffi -- 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
