[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-325-g4523e4b326
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 4523e4b3262e81ed179321c154770b20899041c6 (commit) from c9d5f80d775d33b7334af6421b77cc45cfab5b27 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4523e4b3262e81ed179321c154770b20899041c6 commit 4523e4b3262e81ed179321c154770b20899041c6 Author: Kitware Robot AuthorDate: Sat Nov 9 00:01:07 2019 -0500 Commit: Kitware Robot CommitDate: Sat Nov 9 00:01:07 2019 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 53a560b84a..1374274779 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,7 +1,7 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 16) -set(CMake_VERSION_PATCH 20191108) +set(CMake_VERSION_PATCH 20191109) #set(CMake_VERSION_RC 0) set(CMake_VERSION_IS_DIRTY 0) --- 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 https://cmake.org/mailman/listinfo/cmake-commits
Re: [CMake] Using CMake with TI armcl and armar
Hello Eric,
Thank you – I was able to get the compile options I expected in the make
command when I passed in the Toolchain.cmake file as you had specified in your
email.
I’m having a few more problems getting the command I want.
I’m looking at Code composer studio and here’s the linker command that I want :
"/Applications/ti_ccs9/ccs9/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/bin/armcl"
-mv7M4 --code_state=16 --float_support=FPv4SPD16 -me
--define=DeviceFamily_CC13X2 -g --diag_warning=225 --diag_warning=255
--diag_wrap=off --display_error_number --gen_func_subsections=on -z
-m"gpiointerrupt_CC1352P1_LAUNCHXL_tirtos_ccs.map"
-i"/Applications/ti_ccs9/simplelink_cc13x2_26x2_sdk_3_20_00_68/source"
-i"/Applications/ti_ccs9/simplelink_cc13x2_26x2_sdk_3_20_00_68/kernel/tirtos/packages"
-i"/Applications/ti_ccs9/ccs9/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/lib"
--diag_wrap=off --display_error_number --warn_sections
--xml_link_info="gpiointerrupt_CC1352P1_LAUNCHXL_tirtos_ccs_linkInfo.xml"
--rom_model -o "gpiointerrupt_CC1352P1_LAUNCHXL_tirtos_ccs.out"
"CMakeFiles/test.dir/CC1352P1_LAUNCHXL.c.obj"
"CMakeFiles/test.dir/CC1352P1_LAUNCHXL_fxns.c.obj"
"CMakeFiles/test.dir/ccfg.c.obj" "CMakeFiles/test.dir/gpiointerrupt.c.obj"
"CMakeFiles/test.dir/main_tirtos.c.obj" "../CC1352P1_LAUNCHXL_TIRTOS.cmd"
-l"ti/display/lib/display.aem4f" -l"ti/grlib/lib/ccs/m4f/grlib.a"
-l"third_party/spiffs/lib/ccs/m4f/spiffs_cc26xx.a"
-l"ti/drivers/rf/lib/rf_multiMode_cc13x2.aem4f"
-l"ti/drivers/lib/drivers_cc13x2.aem4f" -l"ti/dpl/lib/dpl_cc13x2.aem4f"
-l"../linker.cmd" -l"ti/devices/cc13x2_cc26x2/driverlib/bin/ccs/driverlib.lib"
-llibc.a
Here is the linker command that I am currently running :
/Applications/ti_ccs9/ccs9/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/bin/armcl
--run_linker --output_file=test.out --map_file=test.out.map -mv7M4
--code_state=16 --float_support=FPv4SPD16 -me --define=DeviceFamily_CC13X2 -g
--diag_warning=225 --diag_warning=255 --diag_wrap=off --display_error_number
--gen_func_subsections=on
--xml_link_info=gpiointerrupt_CC1352P1_LAUNCHXL_tirtos_ccs_linkInfo.xml
CMakeFiles/test.out.dir/main_tirtos.c.obj
CMakeFiles/test.out.dir/CC1352P1_LAUNCHXL_fxns.c.obj
CMakeFiles/test.out.dir/CC1352P1_LAUNCHXL.c.obj
CMakeFiles/test.out.dir/gpiointerrupt.c.obj CMakeFiles/test.out.dir/ccfg.c.obj
--search_path=/Applications/ti_ccs9/ccs9/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/lib
/Applications/ti_ccs9/ccs9/ccs/tools/compiler/ti-cgt-arm_18.12.2.LTS/lib/libc.a
/Applications/ti_ccs9/simplelink_cc13x2_26x2_sdk_3_20_00_68/source/ti/display/lib/display.aem4f
/Applications/ti_ccs9/simplelink_cc13x2_26x2_sdk_3_20_00_68/source/ti/grlib/lib/ccs/m4f/grlib.a
/Applications/ti_ccs9/simplelink_cc13x2_26x2_sdk_3_20_00_68/source/third_party/spiffs/lib/ccs/m4f/spiffs.a
/Applications/ti_ccs9/simplelink_cc13x2_26x2_sdk_3_20_00_68/source/ti/drivers/rf/lib/rf_multiMode_cc13x2.aem4f
/Applications/ti_ccs9/simplelink_cc13x2_26x2_sdk_3_20_00_68/source/ti/drivers/lib/drivers_cc13x2.aem4f
/Applications/ti_ccs9/simplelink_cc13x2_26x2_sdk_3_20_00_68/kernel/tirtos/packages/ti/dpl/lib/dpl_cc13x2.aem4f
/Applications/ti_ccs9/simplelink_cc13x2_26x2_sdk_3_20_00_68/source/ti/devices/cc13x2_cc26x2/driverlib/bin/ccs/driverlib.lib
/Applications/ti_ccs9/simplelink_cc13x2_26x2_sdk_3_20_00_68/source/third_party/fatfs/lib/ccs/m4/fatfs.a
../linker.cmd liblwipboard.a liblwipcore.a
I want to add a CC1352P1_LAUNCHXL_TIRTOS.cmd file, which has been added in the
CCS linker command, but I am unable to include It in my linker command. I tried
the following things :
set(LINKER_SCRIPT "${LWIP_DIR}/CC1352P1_LAUNCHXL_TIRTOS.cmd")
set_target_properties(test.out PROPERTIES LINK_DEPENDS
${LWIP_DIR}/CC1352P1_LAUNCHXL_TIRTOS.cmd)
I have also tried passing it in with the cmake command as
>> cmake -DCMAKE_TOOLCHAIN_FILE=../Toolchain_ticomp.cmake
>> -DCMAKE_LINKER=../CC1352P1_LAUNCHXL_TIRTOS.cmd ..
None of these options helped.
This .cmd file has details about stack size, heap size, entry point etc.
I would also like some clarification on where to add the linker command
--rom_model as when I add it to the CMAKE_EXE_LINKER_FLAGS variable in the
Toolchain.cmake file, my cmake hangs at “Detecting CXX compiler ABI info”
Thanks for your help!
Warm regards,
Samyukta
From: CMake on behalf of Eric Doenges
Organization: MVTec Software GmbH
Date: Friday, November 8, 2019 at 12:23 AM
To: "cmake@cmake.org"
Subject: Re: [CMake] Using CMake with TI armcl and armar
Am 07.11.19 um 18:01 schrieb samyuktar:
SET(CMAKE_C_LINK_EXECUTABLE "${CMAKE_C_COMPILER} ${CMAKE_C_FLAGS}
--c_file=../main.c -z --map_file=${TARGET_NAME}.map
--output_file=${TARGET_NAME} ${PLATFORM_CONFIG_L_FLAGS} ${CMD_SRCS} ${LIB}
--include_path ${LWIP_INCLUDE_DIR} --verbose " CACHE STRING
"linker executable")
As far as I can tell, you are trying to combine the compile and link steps, but
CMake expects these to be separate steps. Furthermore, cmake
[CMake] CMake Error Flagged in MSVC Toolchain File
I tried to configure a FLTK build with this: "make .. -G "Visual Studio 16 2019" -A x64 -T "ClangCl" -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_CXX_COMPILER=C:/llvm-project/install/bin/clang-cl.exe -DCMAKE_C_COMPILER=C:/llvm-project/install/bin/clang-cl.exe -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-Xclang -pedantic -Xclang -std=c++17 -Xclang -Wall -Xclang -fexceptions" " and got an error saying: " CMake Error at C:/Program Files (x86)/Microsoft Visual Studio/2019/Community/MSBuild/Microsoft/VC/v160/Platforms/x64/PlatformToolsets/ClangCL/Toolset.targets:1: Parse error. Expected a command name, got unquoted argument with text
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc3-61-g929d7a454c
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, release has been updated via 929d7a454c8069bae4dece36838ed0db6b65d9cf (commit) via a7d9c5e78be43eb21cd24bb5871d279e87653889 (commit) from 11e425be9b205a0a1427b0c60df4f4b1c9ffced0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - --- Summary of changes: Modules/CTestCoverageCollectGCOV.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-324-gc9d5f80d77
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 c9d5f80d775d33b7334af6421b77cc45cfab5b27 (commit) via 86610c65c28dc95875aea5978430c314637f1697 (commit) via 929d7a454c8069bae4dece36838ed0db6b65d9cf (commit) via a7d9c5e78be43eb21cd24bb5871d279e87653889 (commit) from a605a09d6e4b851b09f4126cbf02d9700a07472f (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c9d5f80d775d33b7334af6421b77cc45cfab5b27 commit c9d5f80d775d33b7334af6421b77cc45cfab5b27 Merge: 86610c65c2 929d7a454c Author: Brad King AuthorDate: Fri Nov 8 19:04:08 2019 + Commit: Kitware Robot CommitDate: Fri Nov 8 14:04:17 2019 -0500 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86610c65c28dc95875aea5978430c314637f1697 commit 86610c65c28dc95875aea5978430c314637f1697 Merge: a605a09d6e a7d9c5e78b Author: Brad King AuthorDate: Fri Nov 8 19:04:08 2019 + Commit: Kitware Robot CommitDate: Fri Nov 8 14:04:17 2019 -0500 Merge topic 'CTestCoverageCollectGCOV-typo' a7d9c5e78b CTestCoverageCollectGCOV: Fix typo in ctest_coverage_collect_gcov docs Acked-by: Kitware Robot Merge-request: !4016 --- Summary of changes: Modules/CTestCoverageCollectGCOV.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
Re: [CMake] Suddendly missing members when compiling on macOS Mojave
I had an issue last week, where the isysroot setting was messed up, after I had done an xcode update. Even though I am using Mojave (10.14), instead of Catalina (10.15), xcode has apparently upped the version number from 10.14 to 10.15. /Applications/Xcode.app/Contents/Developer/Platforms/ MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk Creating a brand new build directory fixed the problem, since the cached information concerning the compiler environment was invalid. Regards, Juan On Fri, Nov 8, 2019 at 10:18 AM Ruben Di Battista wrote: > Hello, > > Tryign to compile a project that built correctly since now. I guess > something changed on my system, and now I’m getting this error: > > Scanning dependencies of target Mercurve > /Applications/Xcode.app/Contents/Developer/usr/bin/make -f > src/libs/CMakeFiles/Mercurve.dir/build.make > src/libs/CMakeFiles/Mercurve.dir/build > [ 4%] Building CXX object > src/libs/CMakeFiles/Mercurve.dir/BlockMerger.cxx.o > cd /Users/rubendibattista/git/x/Mercurve/build/src/libs && > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ > -DMercurve_EXPORTS -I/Users/rubendibattista/git/x/Mercurve/src/libs > -isystem /opt/local/include/vtk-8.1 -isystem /opt/local/include -isystem > /opt/local/include/mpich-mp -isystem /opt/local/include/libxml2 -isysroot > /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk > -mmacosx-version-min=10.14 -fPIC -std=gnu++11 -o > CMakeFiles/Mercurve.dir/BlockMerger.cxx.o -c > /Users/rubendibattista/git/x/Mercurve/src/libs/BlockMerger.cxx > In file included from > /Users/rubendibattista/git/x/Mercurve/src/libs/BlockMerger.cxx:21: > In file included from > /Users/rubendibattista/git/x/Mercurve/src/libs/BlockMerger.h:28: > In file included from > /Users/rubendibattista/git/x/Mercurve/src/libs/types.h:25: > In file included from > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/unordered_set:363: > In file included from > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/__hash_table:19: > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cmath:314:9: > error: no member named 'signbit' in the global namespace > using ::signbit; > ~~^ > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cmath:315:9: > error: no member named 'fpclassify' in the global namespace > using ::fpclassify; > ~~^ > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cmath:316:9: > error: no member named 'isfinite' in the global namespace > > Something got messed up with Xcode update I guess. I also tried to > downgrade Xcode without success. Does anyone have hints on how to solve > this? In particular I’m not entirely sure that the `-isysroot` flag the > cmake provides is correct anymore. Is that possible? > > _ > -. .´ | > ', ;|∞∞ > ˜˜ |∞ RdB > ,.,|∞∞ > .' '. | > -' `’ > https://rdb.is > > -- > > 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: > https://cmake.org/mailman/listinfo/cmake > -- Powered by www.kitware.com Please keep messages on-topic and check the CMake FAQ at: http://www.cmake.org/Wiki/CMake_FAQ Kitware offers various services to support the CMake community. For more information on each offering, please visit: CMake Support: http://cmake.org/cmake/help/support.html CMake Consulting: http://cmake.org/cmake/help/consulting.html CMake Training Courses: http://cmake.org/cmake/help/training.html Visit other Kitware open-source projects at http://www.kitware.com/opensource/opensource.html Follow this link to subscribe/unsubscribe: https://cmake.org/mailman/listinfo/cmake
[CMake] Suddendly missing members when compiling on macOS Mojave
Hello, Tryign to compile a project that built correctly since now. I guess something changed on my system, and now I’m getting this error: Scanning dependencies of target Mercurve /Applications/Xcode.app/Contents/Developer/usr/bin/make -f src/libs/CMakeFiles/Mercurve.dir/build.make src/libs/CMakeFiles/Mercurve.dir/build [ 4%] Building CXX object src/libs/CMakeFiles/Mercurve.dir/BlockMerger.cxx.o cd /Users/rubendibattista/git/x/Mercurve/build/src/libs && /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/c++ -DMercurve_EXPORTS -I/Users/rubendibattista/git/x/Mercurve/src/libs -isystem /opt/local/include/vtk-8.1 -isystem /opt/local/include -isystem /opt/local/include/mpich-mp -isystem /opt/local/include/libxml2 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -mmacosx-version-min=10.14 -fPIC -std=gnu++11 -o CMakeFiles/Mercurve.dir/BlockMerger.cxx.o -c /Users/rubendibattista/git/x/Mercurve/src/libs/BlockMerger.cxx In file included from /Users/rubendibattista/git/x/Mercurve/src/libs/BlockMerger.cxx:21: In file included from /Users/rubendibattista/git/x/Mercurve/src/libs/BlockMerger.h:28: In file included from /Users/rubendibattista/git/x/Mercurve/src/libs/types.h:25: In file included from /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/unordered_set:363: In file included from /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/__hash_table:19: /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cmath:314:9: error: no member named 'signbit' in the global namespace using ::signbit; ~~^ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cmath:315:9: error: no member named 'fpclassify' in the global namespace using ::fpclassify; ~~^ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/cmath:316:9: error: no member named 'isfinite' in the global namespace Something got messed up with Xcode update I guess. I also tried to downgrade Xcode without success. Does anyone have hints on how to solve this? In particular I’m not entirely sure that the `-isysroot` flag the cmake provides is correct anymore. Is that possible? _ -. .´ | ', ;|∞∞ ˜˜ |∞ RdB ,.,|∞∞ .' '. | -' `’ https://rdb.is signature.asc Description: Message signed with OpenPGP using AMPGpg -- 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: https://cmake.org/mailman/listinfo/cmake
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-320-ga605a09d6e
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 a605a09d6e4b851b09f4126cbf02d9700a07472f (commit) via c67913846969318fa842a2f42810e9366e2b8188 (commit) via 11e425be9b205a0a1427b0c60df4f4b1c9ffced0 (commit) via f35df783b5c26b5ad1e54719ef1dac062c532bd7 (commit) from d8062b575b4a6246edeac264f6dce8fd3d64e3d6 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a605a09d6e4b851b09f4126cbf02d9700a07472f commit a605a09d6e4b851b09f4126cbf02d9700a07472f Merge: c679138469 11e425be9b Author: Brad King AuthorDate: Fri Nov 8 15:36:21 2019 + Commit: Kitware Robot CommitDate: Fri Nov 8 10:36:30 2019 -0500 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c67913846969318fa842a2f42810e9366e2b8188 commit c67913846969318fa842a2f42810e9366e2b8188 Merge: d8062b575b f35df783b5 Author: Brad King AuthorDate: Fri Nov 8 15:36:21 2019 + Commit: Kitware Robot CommitDate: Fri Nov 8 10:36:30 2019 -0500 Merge topic 'doc-pch-genex' f35df783b5 Help: Document target_precompile_headers genex with angle brackets Acked-by: Kitware Robot Merge-request: !4015 --- Summary of changes: Help/command/target_precompile_headers.rst | 11 +++ 1 file changed, 11 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc3-59-g11e425be9b
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, release has been updated via 11e425be9b205a0a1427b0c60df4f4b1c9ffced0 (commit) via f35df783b5c26b5ad1e54719ef1dac062c532bd7 (commit) from 0f1458022d9e94118a656fa87df0c2daac29a458 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - --- Summary of changes: Help/command/target_precompile_headers.rst | 11 +++ 1 file changed, 11 insertions(+) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-316-gd8062b575b
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 d8062b575b4a6246edeac264f6dce8fd3d64e3d6 (commit)
via 24d52daf49e8da92bf21eeb9f3687c84993ba2b6 (commit)
from b115e96fff2933fd29a4c065222920d192395deb (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 -
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d8062b575b4a6246edeac264f6dce8fd3d64e3d6
commit d8062b575b4a6246edeac264f6dce8fd3d64e3d6
Merge: b115e96fff 24d52daf49
Author: Brad King
AuthorDate: Fri Nov 8 14:50:06 2019 +
Commit: Kitware Robot
CommitDate: Fri Nov 8 09:50:15 2019 -0500
Merge topic 'openssl-pkg-config-directories'
24d52daf49 FindOpenSSL: Lookup all pkg-config directories
Acked-by: Kitware Robot
Merge-request: !4010
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=24d52daf49e8da92bf21eeb9f3687c84993ba2b6
commit 24d52daf49e8da92bf21eeb9f3687c84993ba2b6
Author: Denis Thulin
AuthorDate: Thu Nov 7 15:39:52 2019 +0100
Commit: Denis Thulin
CommitDate: Thu Nov 7 16:44:12 2019 +0100
FindOpenSSL: Lookup all pkg-config directories
When using a custom sysroot to build things using pkg-config, some of
the output variables feature the sysroot while others do not:
```console
$ export PKG_CONFIG_SYSROOT_DIR=/path/to/sysroot
$ export PKG_CONFIG_LIBDIR=/path/to/sysroot/usr/lib/pkgconfig
$ pkg-config --cflags-only-I openssl
-I/path/to/sysroot/usr/include/
$ pkg-config --variable=includedir openssl
/usr/include
$ pkg-config --libs-only-L openssl
-L/path/to/sysroot/usr/lib
$ pkg-config --variable=libdir openssl
/usr/lib
```
When using `pkg_check_modules`, it's pretty much the same:
```cmake
pkg_check_modules(_OPENSSL QUIET openssl)
_OPENSSL_INCLUDE_DIRS == /path/to/sysroot/usr/include/
_OPENSSL_INCLUDEDIR == /usr/include
_OPENSSL_LIBRARY_DIRS == -L/path/to/sysroot/usr/lib
_OPENSSL_LIBDIR == /usr/lib
```
However, FindOpenSSL only searches for headers in `INCLUDEDIR` and
libraries in `LIBDIR` instead of searching `INCLUDE_DIRS` and
`LIBRARY_DIRS` as well.
This fixes that behaviour.
Fixes: #16885
Signed-off-by: Denis Thulin
diff --git a/Modules/FindOpenSSL.cmake b/Modules/FindOpenSSL.cmake
index 33ceab7541..3688ae9dba 100644
--- a/Modules/FindOpenSSL.cmake
+++ b/Modules/FindOpenSSL.cmake
@@ -131,6 +131,7 @@ find_path(OPENSSL_INCLUDE_DIR
${_OPENSSL_ROOT_HINTS_AND_PATHS}
HINTS
${_OPENSSL_INCLUDEDIR}
+${_OPENSSL_INCLUDE_DIRS}
PATH_SUFFIXES
include
)
@@ -319,6 +320,7 @@ else()
${_OPENSSL_ROOT_HINTS_AND_PATHS}
HINTS
${_OPENSSL_LIBDIR}
+ ${_OPENSSL_LIBRARY_DIRS}
PATH_SUFFIXES
lib
)
@@ -330,6 +332,7 @@ else()
${_OPENSSL_ROOT_HINTS_AND_PATHS}
HINTS
${_OPENSSL_LIBDIR}
+ ${_OPENSSL_LIBRARY_DIRS}
PATH_SUFFIXES
lib
)
---
Summary of changes:
Modules/FindOpenSSL.cmake | 3 +++
1 file changed, 3 insertions(+)
hooks/post-receive
--
CMake
___
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, master, updated. v3.16.0-rc3-314-gb115e96fff
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 b115e96fff2933fd29a4c065222920d192395deb (commit) via 9f7ca15de61d6a4e9f1b30569a55641419bfeac2 (commit) via 0f1458022d9e94118a656fa87df0c2daac29a458 (commit) via b2857514b0c08171a171d0e3ce72571c8074b78e (commit) from db669b4d1a5fc7e3cfa3d76a9d35e11753e806e2 (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 - https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b115e96fff2933fd29a4c065222920d192395deb commit b115e96fff2933fd29a4c065222920d192395deb Merge: 9f7ca15de6 0f1458022d Author: Brad King AuthorDate: Fri Nov 8 14:40:55 2019 + Commit: Kitware Robot CommitDate: Fri Nov 8 09:41:05 2019 -0500 Merge branch 'release-3.16' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f7ca15de61d6a4e9f1b30569a55641419bfeac2 commit 9f7ca15de61d6a4e9f1b30569a55641419bfeac2 Merge: db669b4d1a b2857514b0 Author: Brad King AuthorDate: Fri Nov 8 14:40:55 2019 + Commit: Kitware Robot CommitDate: Fri Nov 8 09:41:05 2019 -0500 Merge topic 'revert-FindBinUtils-ask-compiler' b2857514b0 FindBinUtils: Revert "Use the compiler to get the path to compiler tools" Acked-by: Kitware Robot Merge-request: !4009 --- Summary of changes: Modules/CMakeFindBinUtils.cmake | 70 ++--- Modules/Compiler/GNU-FindBinUtils.cmake | 26 +--- 2 files changed, 21 insertions(+), 75 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
[Cmake-commits] CMake branch, release, updated. v3.16.0-rc3-57-g0f1458022d
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake". The branch, release has been updated via 0f1458022d9e94118a656fa87df0c2daac29a458 (commit) via b2857514b0c08171a171d0e3ce72571c8074b78e (commit) from 87dcbe0b2122ee9cfea81369a45d15b22853ba90 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log - --- Summary of changes: Modules/CMakeFindBinUtils.cmake | 70 ++--- Modules/Compiler/GNU-FindBinUtils.cmake | 26 +--- 2 files changed, 21 insertions(+), 75 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org https://cmake.org/mailman/listinfo/cmake-commits
Re: [CMake] Windows C++ static library fails to access external method during initialization
Fixed using OBJECT libraries. Thank you to anyone here who answered on StackOverflow. On Fri, Nov 8, 2019 at 12:02 PM David Aldrich wrote: > Hi, I have a linker problem with a Windows C++ project that uses a static > library. I have described the problem on StackOverflow here: > > > https://stackoverflow.com/questions/58765494/windows-c-static-library-fails-to-access-external-method-during-initialization > > > I think the problem could be resolved by adjusting the CMakeLists.txt > file. Please could someone have a look at the above link and comment > either in StackOverflow or reply here? > > I am using Ninja with the VS2019 C++ compiler on Windows 10. > > Thanks in advance, > David > -- 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: https://cmake.org/mailman/listinfo/cmake
Re: [cmake-developers] CMake removes /DEF: option in CMAKE_SHARED_LINKER_FLAGS
On 11/8/19 5:17 AM, Alexander wrote: > /DEF:"E:/workspace/cmake_test_option/tesseract/bin/libtesseract.dir/Release/exports.def" > is added by CMake automatically and I cannot control it (CMake first creates > a file > objects.txt and then exports.def from it). That behavior is not default, but activated by CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS: https://cmake.org/cmake/help/v3.16/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.html The project you're building must be using that setting. Find it and turn it off. -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: https://cmake.org/mailman/listinfo/cmake-developers
[CMake] Windows C++ static library fails to access external method during initialization
Hi, I have a linker problem with a Windows C++ project that uses a static library. I have described the problem on StackOverflow here: https://stackoverflow.com/questions/58765494/windows-c-static-library-fails-to-access-external-method-during-initialization I think the problem could be resolved by adjusting the CMakeLists.txt file. Please could someone have a look at the above link and comment either in StackOverflow or reply here? I am using Ninja with the VS2019 C++ compiler on Windows 10. Thanks in advance, David -- 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: https://cmake.org/mailman/listinfo/cmake
Re: [cmake-developers] CMake removes /DEF: option in CMAKE_SHARED_LINKER_FLAGS
I am sorry that I did not make it clear from the beginning. You are right.
Not only MSBuild, but MSVC linker (link.exe) accepts only one /DEF
parameter according to
https://docs.microsoft.com/en-us/cpp/build/reference/def-specify-module-definition-file?view=vs-2019
:
"""
The /DEF option passes a module-definition file (.def) to the linker. Only
one .def file can be specified to LINK.
"""
In reality you can pass multiple /DEF to the linker, but it uses the last
one.
The problem is that the original /DEF parameter
/DEF:"E:/workspace/cmake_test_option/tesseract/bin/libtesseract.dir/Release/exports.def"
is added by CMake automatically and I cannot control it (CMake first
creates a file objects.txt and then exports.def from it).
I wanted to override this parameter with a custom /DEF parameter, that
means my /DEF parameter must be passed after that default one in the
linking command.
However, as you can see from the linking command in my previous e-mail, I
could not easily achieve this with the current CMake functionality, because:
- CMAKE_CXX_STANDARD_LIBRARIES adds custom /DEF parameter before the
default /DEF:exports.def that does not help
- CMAKE_SHARED_LINKER_FLAGS adds something to the end of the command, but
only if this something is not /DEF (because one /DEF is already defined and
CMake does not overwrite it, as you said earlier)
So, does CMake provide a way to override the value of the default
/DEF:exports.def or does it provide a way to pass my custom
/DEF after the default one so that link.exe would use my custom /DEF
parameter?
--
Best Regards,
Alexander
On Tue, 5 Nov 2019 at 17:57, Brad King wrote:
> On 11/5/19 7:30 AM, Alexander wrote:
> > string(APPEND CMAKE_SHARED_LINKER_FLAGS " -DEF:\"foo_1.def\"
> -DEF111:\"foo_1.def\"")
>
> This was the first you've mentioned using more than one copy of the flag.
>
> I tested with this:
>
> ```
> string(APPEND CMAKE_SHARED_LINKER_FLAGS "
> -DEF:\"${CMAKE_CURRENT_SOURCE_DIR}/foo.def\"")
> string(APPEND CMAKE_SHARED_LINKER_FLAGS "
> -DEF:\"${CMAKE_CURRENT_SOURCE_DIR}/bar.def\"")
> ```
>
> With the command-line generators like Ninja or NMake Makefiles, both flags
> appear. With the Visual Studio generators, only the latter flag appears.
>
> The reason is that CMake maps the `-DEF:` linker flag to the `.vcxproj`
> file element `ModuleDefinitionFile` but only puts one value in it. The
> MSBuild documentation for that field is here:
>
>
> https://docs.microsoft.com/en-us/visualstudio/msbuild/link-task?view=vs-2019
>
> and says "Specifies the name of a module definition file." AFAIK it only
> supports one value. This is a limitation of MSBuild.
>
> -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:
https://cmake.org/mailman/listinfo/cmake-developers
