[cmake-developers] Making kwsys a proper library
There is concern in Fedora that the kwsys code has become too large to be an acceptable copylib. However, as cmake is constructed at the moment it would be a huge undertaking for the Fedora packagers (mostly me) to remove it downstream. So I'm asking if there is any support upstream for making kwsys a proper library? See also: https://bugzilla.redhat.com/show_bug.cgi?id=1251198 https://fedorahosted.org/fpc/ticket/555 https://bugzilla.redhat.com/show_bug.cgi?id=1251500 Thanks -- Orion Poplawski Technical Manager 303-415-9701 x222 NWRA/CoRA DivisionFAX: 303-415-9702 3380 Mitchell Lane or...@cora.nwra.com Boulder, CO 80301 http://www.cora.nwra.com -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: http://public.kitware.com/mailman/listinfo/cmake-developers
[cmake-developers] [patch] Support for Boost 1.59
The attached patch adds Boost 1.59.0/1.59 to the list of supported
versions in the FindBoost module.
Tested on: Ubuntu 14.04 and Windows with VS2013 with Boost 1.59.0.
Regards,
Roger
>From 0419a7bd7f1da27bcbf9eaba424fda99cc030867 Mon Sep 17 00:00:00 2001
From: Roger Leigh
Date: Thu, 13 Aug 2015 23:34:39 +0100
Subject: [PATCH] FindBoost: Add support for Boost 1.59
---
Modules/FindBoost.cmake | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 05b552a..33e6a49 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -512,13 +512,15 @@ else()
# The user has not requested an exact version. Among known
# versions, find those that are acceptable to the user request.
set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS}
-"1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55" "1.54.0" "1.54"
-"1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
+
+"1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55"
+"1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51"
"1.50.0" "1.50" "1.49.0" "1.49" "1.48.0" "1.48" "1.47.0" "1.47" "1.46.1"
"1.46.0" "1.46" "1.45.0" "1.45" "1.44.0" "1.44" "1.43.0" "1.43" "1.42.0" "1.42"
"1.41.0" "1.41" "1.40.0" "1.40" "1.39.0" "1.39" "1.38.0" "1.38" "1.37.0" "1.37"
"1.36.1" "1.36.0" "1.36" "1.35.1" "1.35.0" "1.35" "1.34.1" "1.34.0"
"1.34" "1.33.1" "1.33.0" "1.33")
+
set(_boost_TEST_VERSIONS)
if(Boost_FIND_VERSION)
set(_Boost_FIND_VERSION_SHORT "${Boost_FIND_VERSION_MAJOR}.${Boost_FIND_VERSION_MINOR}")
--
2.4.6
--
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] Add option "--no-return-code"
Hi there,
I like to add the option "--no-return-code" to ctest.
We use ctest on Jenkins in a shell build step. Jenkins will FAIL the build
if the last command (ctest) will return a non-zero return code even the
configured UNSTABLE/FAIL threshold is not reached.
The only work-around is to call another useless command after it. This
won't be necessary if ctest could ignore the return codes.
Best regards
André Klitzing
From 2829f563b5b7454337471e44e3e648e0acddc9a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Klitzing?=
Date: Thu, 13 Aug 2015 21:52:10 +0200
Subject: [PATCH] CTest: Add a new --no-return-code option
This option tells ctest to ignore every return code of tests and
return 0 (SUCCESS) even if a test failed. This is useful to run
ctest on Jenkins without failing the build and let Jenkins
decide if a build is UNSTABLE or FAILED regarding of a defined
threshold.
---
Source/cmCTest.cxx | 6 ++
Source/cmCTest.h | 3 +++
Source/ctest.cxx | 3 ++-
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index b976469..287a798 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -311,6 +311,7 @@ cmCTest::cmCTest()
this->RunConfigurationScript = false;
this->UseHTTP10 = false;
this->PrintLabels= false;
+ this->NoReturnCode = false;
this->CompressTestOutput = true;
this->CompressMemCheckOutput = true;
this->TestModel = cmCTest::EXPERIMENTAL;
@@ -2103,6 +2104,11 @@ bool cmCTest::HandleCommandLineArguments(size_t &i,
this->PrintLabels = true;
}
+ if(this->CheckArgument(arg, "--no-return-code"))
+{
+this->NoReturnCode = true;
+}
+
if(this->CheckArgument(arg, "--http1.0"))
{
this->UseHTTP10 = true;
diff --git a/Source/cmCTest.h b/Source/cmCTest.h
index 73c2807..976dae8 100644
--- a/Source/cmCTest.h
+++ b/Source/cmCTest.h
@@ -231,6 +231,8 @@ public:
bool ShouldPrintLabels() { return this->PrintLabels; }
+ bool GetNoReturnCode() { return this->NoReturnCode; }
+
bool ShouldCompressTestOutput();
bool ShouldCompressMemCheckOutput();
bool CompressString(std::string& str);
@@ -451,6 +453,7 @@ private:
bool LabelSummary;
bool UseHTTP10;
bool PrintLabels;
+ bool NoReturnCode;
bool Failover;
bool BatchJobs;
diff --git a/Source/ctest.cxx b/Source/ctest.cxx
index afcbd61..93deb74 100644
--- a/Source/ctest.cxx
+++ b/Source/ctest.cxx
@@ -113,6 +113,7 @@ static const char * cmDocumentationOptions[][2] =
{"--http1.0", "Submit using HTTP 1.0."},
{"--no-compress-output", "Do not compress test output when submitting."},
{"--print-labels", "Print all available test labels."},
+ {"--no-return-code", "Ignore every return code and returns 0 even on failed tests."},
{0,0}
};
@@ -194,6 +195,6 @@ int main (int argc, char const* const* argv)
int res = inst.Run(args,&output);
cmCTestLog(&inst, OUTPUT, output);
- return res;
+ return inst.GetNoReturnCode() ? EXIT_SUCCESS : res;
}
--
2.5.0
--
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] [ANNOUNCE] CMake 3.3.1 available for download
We are pleased to announce that CMake 3.3.1 is now available for download. Please use the latest release from our download page: http://www.cmake.org/download/ Thanks for your support! - Changes in 3.3.1 since 3.3.0: Ben Boeckel (1): ctest: fix add_subdirectory() crash Brad King (3): add_subdirectory: Fix error message on missing CMakeLists.txt (#15680) Fortran: Store detected compiler version persistently (#15684) CMake 3.3.1 Gregor Jasny (1): Xcode: Quote strings containing a tilde (#15672) -- 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 0015696]: cpack preinstall of subdirectory regression in 3.3
The following issue has been SUBMITTED.
==
http://www.cmake.org/Bug/view.php?id=15696
==
Reported By:Clinton Stimpson
Assigned To:
==
Project:CMake
Issue ID: 15696
Category: CPack
Reproducibility:have not tried
Severity: minor
Priority: normal
Status: new
==
Date Submitted: 2015-08-13 15:10 EDT
Last Modified: 2015-08-13 15:10 EDT
==
Summary:cpack preinstall of subdirectory regression in 3.3
Description:
For one cpack config file, I want to package up only a certain subdirectory.
For that, I set CPACK_INSTALL_CMAKE_PROJECTS
SET(CPACK_INSTALL_CMAKE_PROJECTS ${CMAKE_CURRENT_BINARY_DIR} MyProject "ALL" "/"
)
INCLUDE(CPack)
When I run cpack, I get the following error:
CPack Error: Problem running install command: /usr/local/bin/cmake --build .
--target "preinstall"
Please check
/home/cjstimp/cmake/test-cpack-subdir/build/_CPack_Packages/Linux/ZIP/PreinstallOutput.log
for errors
Steps to Reproduce:
Use the attached example project.
>From the build directory, run
cpack -G ZIP .
Additional Information:
Git bisect reveals this commit introduced the error.
93a3ec8b7705c6edfa08a59a789d193fcb4cf4c1 is the first bad commit
commit 93a3ec8b7705c6edfa08a59a789d193fcb4cf4c1
Author: Brad King
Date: Tue Mar 31 10:26:29 2015 -0400
CPack: Fix make tool selection during preinstall
(http://www.cmake.org/Bug/view.php?id=15483)
==
Issue History
Date ModifiedUsername FieldChange
==
2015-08-13 15:10 Clinton StimpsonNew Issue
2015-08-13 15:10 Clinton StimpsonFile Added: test-cpack-subdir.tar.gz
==
--
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] Support debug libraries for TIFF and Xerces-C libraries
> On 08/07/2015 09:59 AM, rle...@codelibre.net wrote:
>> Please find attached two patches which allow these libraries to detect
>> debug versions of the libraries on Windows. I copied the behaviour from
>> the PNG module as suggested on #cmake.
>
> Thanks. Here are some comments:
>
>> +if(NOT TIFF_LIBRARY)
>> + find_library(TIFF_LIBRARY_RELEASE NAMES ${TIFF_NAMES})
>> + find_library(TIFF_LIBRARY_DEBUG NAMES ${TIFF_NAMES_DEBUG})
>> + include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
>> + mark_as_advanced(TIFF_LIBRARY_RELEASE TIFF_LIBRARY_DEBUG)
>> +endif()
>
> This appears to be missing a call to select_library_configurations.
Oops, yes. I've attached an updated patch adding this.
>> -# Find all XercesC libraries
>> -find_library(XercesC_LIBRARY NAMES "xerces-c" "xerces-c_3" "xerces-c_2"
>> - DOC "Xerces-C++ libraries")
>> -mark_as_advanced(XercesC_LIBRARY)
>> +if(NOT XercesC_LIBRARY)
>> + # Find all XercesC libraries
>> + find_library(XercesC_LIBRARY_RELEASE
>> + NAMES "xerces-c" "xerces-c_3"
>> + DOC "Xerces-C++ libraries (release)")
>> + find_library(XercesC_LIBRARY_DEBUG
>> + NAMES "xerces-cd" "xerces-c_3D" "xerces-c_3_1D"
>> + DOC "Xerces-C++ libraries (debug)")
>> + include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake)
>> + select_library_configurations(XercesC)
>> + mark_as_advanced(XercesC_LIBRARY_RELEASE XercesC_LIBRARY_DEBUG)
>> +endif()
>
> This changes the set of version numbers considered. Please start
> with a patch to do just the debug libraries for the same version
> numbers and then add the new versions as a separate patch.
Done. Note that this is due to how the upstream Visual Studio project
files default to building the debug libraries--for reasons only known to
themselves, the release and debug numbering scheme differs.
Regards,
Roger
0001-FindTIFF-Find-debug-libraries.patch
Description: Binary data
0001-FindXercesC-Find-debug-libraries.patch
Description: Binary data
biny1hcvwWvN0.bin
Description: Binary data
--
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 0015695]: CMAKE_*_OUTPUT_DIRECTORY existence is not evaluated by cmake_check_build_system target
The following issue has been SUBMITTED.
==
https://public.kitware.com/Bug/view.php?id=15695
==
Reported By:bugreporter
Assigned To:
==
Project:CMake
Issue ID: 15695
Category: CMake
Reproducibility:always
Severity: minor
Priority: normal
Status: new
==
Date Submitted: 2015-08-13 11:48 EDT
Last Modified: 2015-08-13 11:48 EDT
==
Summary:CMAKE_*_OUTPUT_DIRECTORY existence is not evaluated
by cmake_check_build_system target
Description:
If you are specifying certain CMAKE_*_OUTPUT_DIRECTORY variables they are
properly created when CMake generation is done, but in case you are removing the
specified directories after a successful run they are not recreated until you
re-run CMake.
It would be good to track this paths for evaluation within the
cmake_check_build_system target, so that the re-run of CMake is automatically
done in case the folders are not existing.
Steps to Reproduce:
project(Example)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/libstatic)
add_executable(TestExecutable test1.cpp)
add_library(TestLibrary SHARED test2.cpp)
add_library(TestLibrary2 STATIC test3.cpp)
==
Issue History
Date ModifiedUsername FieldChange
==
2015-08-13 11:48 bugreporterNew 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] add support for ARTOS platform
On 08/13/2015 08:24 AM, Kars de Jong wrote:
> GNU-DetermineCompiler.cmake: support very old versions of GCC
Applied, thanks:
GNU-DetermineCompiler: Add support for very old versions of GCC
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6699834d
> Add support for ARTOS platform
Thanks for working on this. Here are some comments.
For reference, EUROS was recently added here:
Add EUROS RTOS platform description file
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=606b29d4
and was also originally based on eCos.
> +# find ARTOS stdio library
> +find_library(ARTOS_SYSTEM_STDIO_LIBRARY stdio)
> +
> +if(NOT ARTOS_SYSTEM_STDIO_LIBRARY)
> + message(FATAL_ERROR "Could not find ARTOS \"stdio.a\". Build ARTOS first
> and set up CMAKE_FIND_ROOT_PATH correctly.")
> +endif()
Is the "stdio" library is a system library that is expected to
be provided by the toolchain? In this case one should not have
to use find_library and can instead just pass "stdio" as a
link item, thus trusting the linker to find it.
> +add_definitions(-DARTOS -Xp -+)
> +set(CMAKE_REQUIRED_LIBRARIES ${ARTOS_SYSTEM_STDIO_LIBRARY})
A platform information file should be completely declarative.
eCos should not be using add_definitions but has been kept
for historical reasons. A New ARTOS module should not follow
this pattern.
Instead there should be files like
Modules/Platform/ARTOS-GNU-C.cmake
Modules/Platform/ARTOS-GNU-CXX.cmake
that take care of updating the compiler rules for this platform.
See Modules/Platform/Windows-MSVC-{C,CXX}.cmake for an example.
They share code in Modules/Platform/Windows-MSVC.cmake which
sets up the compiler rules with the platform-specific flags.
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] Generator expressions for output directory
Awesome! Thanks Brad. I will now look into the OUTPUT_NAME recursion issue. Cheers! -Original Message- From: Brad King [mailto:brad.k...@kitware.com] Sent: Thursday, August 13, 2015 10:33 AM To: Robert Goulet Cc: cmake-developers@cmake.org Subject: Re: [cmake-developers] Generator expressions for output directory On 08/11/2015 01:51 PM, Robert Goulet wrote: > Here's the updated patch for OUTPUT_DIRECTORY supporting genex. Thanks. Applied with a few tweaks: cmTarget: Detect and diagnose recursion in GetOutputInfo http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e36a05fd Add generator expression support to OUTPUT_DIRECTORY target properties http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d25819bc -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] Generator expressions for output directory
On 08/11/2015 01:51 PM, Robert Goulet wrote: > Here's the updated patch for OUTPUT_DIRECTORY supporting genex. Thanks. Applied with a few tweaks: cmTarget: Detect and diagnose recursion in GetOutputInfo http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e36a05fd Add generator expression support to OUTPUT_DIRECTORY target properties http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d25819bc -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] Imported OpenSSL
Hello, Brad! Again OpenSSL :-) Topic branch (for reference) http://git.podsvirov.pro/?p=kitware/cmake.git;a=shortlog;h=refs/heads/topic-imported-openssl 11.08.2015, 22:35, "Gregor Jasny" : > On 07/08/15 13:22, Konstantin Podsvirov wrote: >> Hi developers and experts OpenSSL! >> >> I added a little boring and dense of code at the end FindOpenSSL.cmake >> module. >> I just want to have imported the OpenSSL library for creating relocatable >> packages. >> >> I created a theme topic-imported-openssl on my server: >> http://git.podsvirov.pro/?p=kitware/cmake.git;a=shortlog;h=refs/heads/topic-imported-openssl >> >> Now I have a single commit: >> http://git.podsvirov.pro/?p=kitware/cmake.git;a=commit;h=b47293f212f270844dcd32e36cff2a8668080c46 > > Two comments: >> + INTERFACE_LINK_LIBRARIES OpenSSL::Crypto >> + IMPORTED_LINK_INTERFACE_LIBRARIES OpenSSL::Crypto >> + IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG OpenSSL::Crypto >> + IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE OpenSSL::Crypto) > > IMHO the last three are superfluous. Also documentation states that > IMPORTED_LINK_INTERFACE_LIBRARIES is deprecated. Fixed: http://git.podsvirov.pro/?p=kitware/cmake.git;a=commit;h=273183ff776e153410c04e2f564addfde62558a4 >> +# This module defines :prop_tgt:`IMPORTED` target `OpenSSL::SSL` and >> +# `OpenSSL::Crypto`, if OPENSSL_SSL_LIBRARY and OPENSSL_CRYPTO_LIBRARY >> +# has been found. > > ^^^ > have been Fixed: http://git.podsvirov.pro/?p=kitware/cmake.git;a=commit;h=2d695eba249eec20eafdc32873d150342f3ee926 > Thanks, > Gregor 11.08.2015, 16:05, "Brad King" : > On 08/07/2015 07:22 AM, Konstantin Podsvirov wrote: >> I created a theme topic-imported-openssl on my server: >> http://git.podsvirov.pro/?p=kitware/cmake.git;a=shortlog;h=refs/heads/topic-imported-openssl > > Thanks. Please revise the patch to add the IMPORTED_CONFIGURATIONS > target property listing the configurations that exist. See the > FindQt4, FindGSL, and FindGTK2 modules for examples. Fixed: http://git.podsvirov.pro/?p=kitware/cmake.git;a=commit;h=33c2ea3908cdb196dfc88266480497106ea28649 > Also please add a test. Grep in the Tests directory for "FindGSL" > to see the structure of how we're testing find modules. Fixed: http://git.podsvirov.pro/?p=kitware/cmake.git;a=commit;h=a50228237f9dfffd856362fd68b61260520c0848 http://git.podsvirov.pro/?p=kitware/cmake.git;a=commit;h=56ceb2dc3414246665510802e938ad9f1c60ed46 I checked the test c for Windows options: -DCMake_TEST_FindOpenSSL=ON -DOPENSSL_ROOT_DIR= For me it works. > Thanks, > -Brad Brad, please consider the changes and the possibility of their application. -- Regards, Konstantin Podsvirov -- 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] Setting up environment using ExternalProject_Add
On 08/12/2015 08:06 PM, James Johnston wrote:
>> http://www.cmake.org/Bug/view.php?id=15653
> I'll explore that option some more, after the feature you linked to is
> addressed.
Currently no one is looking at addressing it. If you want to work on
it, take a look at the PERMISSIONS option of the install() command:
http://www.cmake.org/cmake/help/v3.3/command/install.html
There has also been discussion before about permissions options that
respect umask:
http://www.cmake.org/Bug/view.php?id=10126#c19488
http://www.cmake.org/Bug/view.php?id=15163
> 1. The new _ENVIRONMENT setting points to a "environment-set" script
> that does not try to do any launching (e.g. you could pass VCVarsAll.bat
> directly as the _ENVIRONMENT). ExternalProject determines which shell
> to generate for, and generates the "environment-set-and-launch script"
> itself from scratch (like how I originally proposed with the "cmake -E"
> enhancement).
>
> In other words, ExternalProject( CONFIGURE_ENVIRONMENT
> $ENV{VS100COMNTOOLS}/../../VC/vcvarsall.bat x86 CMAKE_GENERATOR Ninja
> CMAKE_CACHE_ARGS ) and away the user goes..
I think that is the simplest approach. It should be easier to use
and also allows us to change how it works underneath in the future if
needed because CMake retains control of the final script generation.
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] add support for ARTOS platform
Hello everyone, The attached patches add support for the ARTOS platform (a real time operating system developed by Locamation) to CMake. GNU-DetermineCompiler.cmake: support very old versions of GCC Add support for ARTOS platform Modules/Compiler/GNU-DetermineCompiler.cmake | 4 ++- Modules/Platform/ARTOS.cmake | 46 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 Modules/Platform/ARTOS.cmake -- 1.9.5.msysgit.1 Kind regards, Kars de Jong Senior Software Engineer 0001-GNU-DetermineCompiler.cmake-support-very-old-version.patch Description: 0001-GNU-DetermineCompiler.cmake-support-very-old-version.patch 0002-Add-support-for-ARTOS-platform.patch Description: 0002-Add-support-for-ARTOS-platform.patch -- 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] Fixing bug #12506 (iOS install)
On 13-Aug-15 08:46, Gregor Jasny wrote:
Hi,
On 13/08/15 01:44, Ruslan Baratov via cmake-developers wrote:
Sending patches with fix. Now it's possible to install simulator
libraries by:
> cmake --build _builds --config Release --target install -- -sdk
iphonesimulator
and device libraries by:
> cmake --build _builds --config Release --target install -- -sdk
iphoneos
or from Xcode IDE (build target install).
However this commands will install both libraries to the same location.
This behaviour can be improved by adding some code that will do lipo of
all libraries before install (i.e. universal libraries will be
installed). This can be achieved by using ONLY_ACTIVE_ARCHS=NO while
running Xcode build. The only question is about making install target
depends on two type of builds (-sdk iphonesimulator and -sdk iphoneos).
This was my preliminary work:
https://github.com/gjasny/CMake/commit/978dca25ac387bdec894a1ba2c934317f5f6169f
This looks great! I've spent several hours trying to figure out how
'$(EFFECTIVE_PLATFORM_NAME)' can be set to Xcode and some CMake friendly
string to cmake_install.cmake script. I didn't know Xcode understand
`${VAR}` syntax (probably it didn't, it's just expanded as an
environment variable). I've tested your fix and it works fine for me.
Since we don't need to replace string with path manually I think your
solution is neater. I've added description to commit and rebased it, see
attachment.
Thanks, Ruslo
>From a85eaddb5d1df693606a3c86b754d01a0efcb4e7 Mon Sep 17 00:00:00 2001
From: Gregor Jasny
Date: Thu, 13 Aug 2015 13:03:02 +0300
Subject: [PATCH] Fix installation of iOS targets
Since cmTarget::ComputeOutputDir results can be used in CMake code of script
cmake_install.cmake and in Xcode internals, string ${EFFECTIVE_PLATFORM_NAME}
should be used instead of $(EFFECTIVE_PLATFORM_NAME) because it works for both.
Value of CMAKE_CFG_INTDIR can't be used in BUILD_TYPE argument of install
command since it contains $(EFFECTIVE_PLATFORM_NAME) (e.g. equals to
`Release-iphoneos`, `Debug-iphoneos`, etc.).
Fix bug: http://public.kitware.com/Bug/view.php?id=12506
---
Source/cmGlobalGenerator.cxx | 13 -
Source/cmTarget.cxx | 2 +-
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index cda26cd..933839c 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -2472,7 +2472,18 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
if ( cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.' )
{
std::string cfgArg = "-DBUILD_TYPE=";
- cfgArg += mf->GetDefinition("CMAKE_CFG_INTDIR");
+ const char *platforms =
+mf->GetDefinition("CMAKE_XCODE_EFFECTIVE_PLATFORMS");
+ if(platforms)
+{
+cfgArg += "$(CONFIGURATION)";
+singleLine.push_back(cfgArg);
+cfgArg = "-DEFFECTIVE_PLATFORM_NAME=$(EFFECTIVE_PLATFORM_NAME)";
+}
+ else
+{
+cfgArg += mf->GetDefinition("CMAKE_CFG_INTDIR");
+}
singleLine.push_back(cfgArg);
}
singleLine.push_back("-P");
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 316d85c..3ac9e8e 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -3536,7 +3536,7 @@ bool cmTarget::ComputeOutputDir(const std::string& config,
const char *platforms = this->Makefile->GetDefinition(
"CMAKE_XCODE_EFFECTIVE_PLATFORMS");
std::string suffix =
- usesDefaultOutputDir && platforms ? "$(EFFECTIVE_PLATFORM_NAME)" : "";
+ usesDefaultOutputDir && platforms ? "${EFFECTIVE_PLATFORM_NAME}" : "";
this->Makefile->GetGlobalGenerator()->
AppendDirectoryForConfig("/", conf, suffix, out);
}
--
2.4.5
--
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
