[Cmake-commits] CMake branch, master, updated. v3.7.2-1147-g8ea12a8
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 8ea12a8b80c4c3153cc602f1d0735b3db8581ae8 (commit) from ae629a0dc9fa775230f4ce0157f13fde99381c9c (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=8ea12a8b80c4c3153cc602f1d0735b3db8581ae8 commit 8ea12a8b80c4c3153cc602f1d0735b3db8581ae8 Author: Kitware Robot <kwro...@kitware.com> AuthorDate: Sun Jan 22 00:01:07 2017 -0500 Commit: Kitware Robot <kwro...@kitware.com> CommitDate: Sun Jan 22 00:01:07 2017 -0500 CMake Nightly Date Stamp diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index 8329dec..89ffb82 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 7) -set(CMake_VERSION_PATCH 20170121) +set(CMake_VERSION_PATCH 20170122) #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] Generate a file with a custom command as part of build
add_custom_command is the probably the right thing…but it needs to be triggered by a dependency relationship. You will specify public/bundle.js as the OUTPUT parameter of the add_custom_command and then some other target or install command needs to have that file listed in its sources, and then CMAKE will understand that it needs to run the custom command to generate that OUTPUT file before it runs the dependent target. I think add_custom_command can also be explicitly linked to a specific target (there are two forms of the command) - and in that case I think it always runs (?) when that target rebuilds…I’m not completely sure about that, so you might need to test. Alternatively, if you want to run the generation at the time of makefile generation (when CMAKE is run…), then have a look at execute_process. The downside of that is that it will generally always run when CMAKE is run, but never during the make process so it doesn’t really handle updates to the source (input) files very well. I’m not sure which technique applies best to your situation here. HTH, Mike > On Jan 21, 2017, at 4:01 PM, doug liveseywrote: > > Hi, I want to call the following command as part of a build: > > $ ./node_modules/.bin/webpack > > This should generate a file public/bundle.js > > I'm really struggling with this. I guess there's something fundamental that > I'm not understanding. `add_custom_command` doesn't seem to be doing anything. > I would anticipate that it would put the command I want to call in the > makefile, but it hasn't. > If anyone could advise me on what I'm not getting here, that would be > brilliant. > Cheers, >Doug. > -- > > 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] Generate a file with a custom command as part of build
Hi, I want to call the following command as part of a build: $ ./node_modules/.bin/webpack This should generate a file public/bundle.js I'm really struggling with this. I guess there's something fundamental that I'm not understanding. `add_custom_command` doesn't seem to be doing anything. I would anticipate that it would put the command I want to call in the makefile, but it hasn't. If anyone could advise me on what I'm not getting here, that would be brilliant. Cheers, Doug. -- 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] Strange test failure
Thanks, Nils, I figured it out. On Jan 20, 2017 2:41 AM, "Nils Gladitz"wrote: > On 01/20/2017 12:59 AM, Aaron Boxer wrote: > > I have a test in my ctest suite that fails both with >> and without a ! at the beginning of the test. >> >> So, >> >> FOO -BAR -BAZ >> >> fails >> >> and >> >> !FOO -BAR -BAZ >> >> fails. >> > > I am not aware of "!" having any special meaning in the context of CTest. > Can you elaborate? > > >> Any ideas, or how can I get more info on the failure ? >> > > ctest -V or ctest --output-on-failure might help. > > What type of failure does CTest indicate? > > Nils > -- 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] ExternalProject_Add
>> One possibility is the often mentioned superbuild That is a tempting and I started to go down that route - however, I ran into a problem where my project (which is now also built using ExternalProject_Add) does not have access to the CMake variables. Is the only solution to pass them through the CMAKE_ARGS variable in ExternalProject_Add? On Mon, Jan 9, 2017 at 12:07 AM Hendrik Sattlerwrote: One possibility is the often mentioned superbuild, another is not using find_library() but setting the variables with the library file paths manually (that's static info anyway). Am 8. Januar 2017 22:49:52 MEZ schrieb Saad Khattak : >Hello, > >I have an external project glfw that I added to my project like this: > >== >include(ExternalProject) >ExternalProject_Add(glfw > GIT_REPOSITORY "https://github.com/glfw/glfw.git; > GIT_TAG "master" > > SOURCE_DIR "${CMAKE_SOURCE_DIR}/dep/glfw" > CMAKE_ARGS -DGLFW_BUILD_DOCS=OFF -DGLFW_BUILD_TESTS=OFF >-DGLFW_BUILD_EXAMPLES=OFF >-DCMAKE_INSTALL_PREFIX=${CMAKE_SOURCE_DIR}/install/glfw/ >-DCMAKE_DEBUG_POSTFIX=_d > > TEST_COMMAND "" > ) >set(GLFW_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/install/glfw/include/") >set(GLFW_LIBRARY_DIR "${CMAKE_SOURCE_DIR}/install/glfw/lib/") >== > >Then I include it in my project like so: > >== >find_library(GLFW_LIB_D glfw3_d ${GLFW_LIBRARY_DIR}) >find_library(GLFW_LIBglfw3 ${GLFW_LIBRARY_DIR}) > >include_directories(${GLFW_INCLUDE_DIR}) > >add_executable(vk_test > src/vulkan_test.cpp > ) >target_link_libraries(vk_test debug ${GLFW_LIB_D} optimized >${GLFW_LIB}) >add_dependencies(vk_test glfw) >== > >As you can see, I depend on the libraries compiled by the external >project >glfw. Unfortunately, when I first configure the project, CMake >complains >that it cannot find the libraries specified by ${GLFW_LIB_D} and >${GLFW_LIB} variables. > >Of course, this is because CMake did not begin cloning, configuring and >building the glfw project. That only happens AFTER my project has been >configured and starts building. This becomes a chicken and the egg >problem. > >Currently, my solution is to add dummy .lib files so that I can at >least >configure and generate my project. My question is, am I approaching >this >problem in the wrong way? If yes, what is the correct way to add a >dependency to an external project and have it clone/configure/build >BEFORE >the "find_library" call? -- Diese Nachricht wurde von meinem Android-Mobiltelefon mit K-9 Mail gesendet. -- 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.7.2-2282-gf6bdf63
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 f6bdf63b18766c59d8ffca0e0383ad7ee14f0ce9 (commit) via 613019294497177018550dc4969e3c2b9b603f1b (commit) from 0d5d02923532b736915bcfbbb9677c4c2c8638a1 (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=f6bdf63b18766c59d8ffca0e0383ad7ee14f0ce9 commit f6bdf63b18766c59d8ffca0e0383ad7ee14f0ce9 Merge: 0d5d029 6130192 Author: Brad KingAuthorDate: Sat Jan 21 07:36:57 2017 -0500 Commit: CMake Topic Stage CommitDate: Sat Jan 21 07:36:57 2017 -0500 Merge topic 'sanitizer-options' into next 61301929 Revert topic 'sanitizer-options' https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=613019294497177018550dc4969e3c2b9b603f1b commit 613019294497177018550dc4969e3c2b9b603f1b Author: Brad King AuthorDate: Sat Jan 21 07:36:35 2017 -0500 Commit: Brad King CommitDate: Sat Jan 21 07:36:35 2017 -0500 Revert topic 'sanitizer-options' diff --git a/Source/CTest/cmCTestMemCheckHandler.cxx b/Source/CTest/cmCTestMemCheckHandler.cxx index beaef81..a062e64 100644 --- a/Source/CTest/cmCTestMemCheckHandler.cxx +++ b/Source/CTest/cmCTestMemCheckHandler.cxx @@ -607,13 +607,9 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking() this->MemoryTesterDynamicOptions.push_back("-E"); this->MemoryTesterDynamicOptions.push_back("env"); std::string envVar; - std::string extraOptions; + std::string extraOptions = ":" + +this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions"); std::string suppressionsOption; - if (!this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions") - .empty()) { -extraOptions = ":" + - this->CTest->GetCTestConfiguration("MemoryCheckSanitizerOptions"); - } if (!this->CTest->GetCTestConfiguration("MemoryCheckSuppressionFile") .empty()) { suppressionsOption = ":suppressions=" + @@ -636,7 +632,7 @@ bool cmCTestMemCheckHandler::InitializeMemoryChecking() envVar = "UBSAN_OPTIONS"; } std::string outputFile = -envVar + "=log_path=" + this->MemoryTesterOutputFile; +envVar + "=log_path=\"" + this->MemoryTesterOutputFile + "\""; this->MemoryTesterEnvironmentVariable = outputFile + suppressionsOption + extraOptions; break; diff --git a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake index ab4c5ab..352a381 100644 --- a/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake +++ b/Tests/RunCMake/ctest_memcheck/RunCMakeTest.cmake @@ -19,7 +19,7 @@ unset(CMAKELISTS_EXTRA_CODE) #- # add ThreadSanitizer test set(CTEST_EXTRA_CODE -"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"report_bugs=1:history_size=5:exitcode=55\") +"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"report_bugs=1 history_size=5 exitcode=55\") ") set(CMAKELISTS_EXTRA_CODE "add_test(NAME TestSan COMMAND \"\${CMAKE_COMMAND}\" @@ -71,7 +71,7 @@ unset(CTEST_EXTRA_CODE) #- # add MemorySanitizer test set(CTEST_EXTRA_CODE -"set(CTEST_MEMORYCHECK_SANITIZER_OPTIONS \"simulate_sanitizer=1:report_bugs=1:history_size=5:exitcode=55\") +"set(CTEST_MEMORYCHECK_COMMAND_OPTIONS \"simulate_sanitizer=1:report_bugs=1:history_size=5:exitcode=55\") ") set(CMAKELISTS_EXTRA_CODE "add_test(NAME TestSan COMMAND \"\${CMAKE_COMMAND}\" diff --git a/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake index 460d7cb..2a57b11 100644 --- a/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake +++ b/Tests/RunCMake/ctest_memcheck/testAddressLeakSanitizer.cmake @@ -2,7 +2,7 @@ # options message("ASAN_OPTIONS = [$ENV{ASAN_OPTIONS}]") -string(REGEX REPLACE ".*log_path=([^:]*).*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}") +string(REGEX REPLACE ".*log_path=\"([^\"]*)\".*" "\\1" LOG_FILE "$ENV{ASAN_OPTIONS}") message("LOG_FILE=[${LOG_FILE}]") # if we are not asked to simulate AddressSanitizer don't do it diff --git a/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake b/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake index f14a773..3082e4b 100644 --- a/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake +++ b/Tests/RunCMake/ctest_memcheck/testAddressSanitizer.cmake @@ -2,7 +2,7 @@ # options message("ASAN_OPTIONS =
[Cmake-commits] CMake branch, next, updated. v3.7.2-2280-g0d5d029
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 0d5d02923532b736915bcfbbb9677c4c2c8638a1 (commit) via c66720d15dcf9bc8fd478e2bd3ec6cd0aed9fef4 (commit) from 639429cb85ed679c38223c7be1c4a0dfd3b3de39 (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=0d5d02923532b736915bcfbbb9677c4c2c8638a1 commit 0d5d02923532b736915bcfbbb9677c4c2c8638a1 Merge: 639429c c66720d Author: Brad KingAuthorDate: Sat Jan 21 07:36:02 2017 -0500 Commit: CMake Topic Stage CommitDate: Sat Jan 21 07:36:02 2017 -0500 Merge topic 'lang_lint' into next c66720d1 Revert "Add properties to run the cpplint style checker with the compiler" https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c66720d15dcf9bc8fd478e2bd3ec6cd0aed9fef4 commit c66720d15dcf9bc8fd478e2bd3ec6cd0aed9fef4 Author: Brad King AuthorDate: Sat Jan 21 07:35:37 2017 -0500 Commit: Brad King CommitDate: Sat Jan 21 07:35:37 2017 -0500 Revert "Add properties to run the cpplint style checker with the compiler" This reverts commit 211bd24ab3388d44d018f0e4773f9db80c9eb9e0. diff --git a/Auxiliary/vim/syntax/cmake.vim b/Auxiliary/vim/syntax/cmake.vim index 1f19cb7..fabf9c1 100644 --- a/Auxiliary/vim/syntax/cmake.vim +++ b/Auxiliary/vim/syntax/cmake.vim @@ -32,11 +32,11 @@ syn region cmakeArguments start=/(/ end=/)/ syn case match syn keyword cmakeProperty -\ ABSTRACT ADDITIONAL_MAKE_CLEAN_FILES ADVANCED ALIASED_TARGET ALLOW_DUPLICATE_CUSTOM_TARGETS ANDROID_ANT_ADDITIONAL_OPTIONS ANDROID_API ANDROID_API_MIN ANDROID_ARCH ANDROID_ASSETS_DIRECTORIES ANDROID_GUI ANDROID_JAR_DEPENDENCIES ANDROID_JAR_DIRECTORIES ANDROID_JAVA_SOURCE_DIR ANDROID_NATIVE_LIB_DEPENDENCIES ANDROID_NATIVE_LIB_DIRECTORIES ANDROID_PROCESS_MAX ANDROID_PROGUARD ANDROID_PROGUARD_CONFIG_PATH ANDROID_SECURE_PROPS_PATH ANDROID_SKIP_ANT_STEP ANDROID_STL_TYPE ARCHIVE_OUTPUT_DIRECTORY ARCHIVE_OUTPUT_DIRECTORY_DEBUG ARCHIVE_OUTPUT_DIRECTORY_RELEASE ARCHIVE_OUTPUT_NAME ARCHIVE_OUTPUT_NAME_DEBUG ARCHIVE_OUTPUT_NAME_RELEASE ATTACHED_FILES ATTACHED_FILES_ON_FAIL AUTOGEN_TARGETS_FOLDER AUTOGEN_TARGET_DEPENDS AUTOMOC AUTOMOC_MOC_OPTIONS AUTOMOC_TARGETS_FOLDER AUTORCC AUTORCC_OPTIONS AUTOUIC AUTOUIC_OPTIONS BINARY_DIR BUILD_WITH_INSTALL_RPATH BUNDLE BUNDLE_EXTENSION CACHE_VARIABLES CLEAN_NO_CUSTOM CMAKE_CONFIGURE_DEPENDS CMAKE_CXX_KNOWN_FEATURES CMAKE_C_KNOWN_FEATURES COM PATIBLE_INTERFACE_BOOL COMPATIBLE_INTERFACE_NUMBER_MAX COMPATIBLE_INTERFACE_NUMBER_MIN COMPATIBLE_INTERFACE_STRING COMPILE_DEFINITIONS COMPILE_DEFINITIONS_DEBUG COMPILE_DEFINITIONS_RELEASE COMPILE_FEATURES COMPILE_FLAGS COMPILE_OPTIONS COMPILE_PDB_NAME COMPILE_PDB_NAME_DEBUG COMPILE_PDB_NAME_RELEASE COMPILE_PDB_OUTPUT_DIRECTORY COMPILE_PDB_OUTPUT_DIRECTORY_DEBUG COMPILE_PDB_OUTPUT_DIRECTORY_RELEASE COST CPACK_DESKTOP_SHORTCUTS CPACK_NEVER_OVERWRITE CPACK_PERMANENT CPACK_STARTUP_SHORTCUTS CPACK_START_MENU_SHORTCUTS CPACK_WIX_ACL CROSSCOMPILING_EMULATOR CXX_EXTENSIONS CXX_CPPLINT CXX_STANDARD CXX_STANDARD_REQUIRED C_EXTENSIONS C_CPPLINT C_STANDARD C_STANDARD_REQUIRED DEBUG_CONFIGURATIONS DEBUG_POSTFIX DEFINE_SYMBOL DEFINITIONS DEPENDS DISABLED_FEATURES ECLIPSE_EXTRA_NATURES ENABLED_FEATURES ENABLED_LANGUAGES ENABLE_EXPORTS ENVIRONMENT EXCLUDE_FROM_ALL EXCLUDE_FROM_DEFAULT_BUILD EXCLUDE_FROM_DEFAULT_BUILD_DEBUG EXCLUDE_FROM_DEFAULT_BUILD_RELEASE EXPORT_NAME EXTERNAL_OBJECT EchoString F AIL_REGULAR_EXPRESSION FIND_LIBRARY_USE_LIB64_PATHS FIND_LIBRARY_USE_OPENBSD_VERSIONING FOLDER FRAMEWORK FRAMEWORK_VERSION Fortran_FORMAT Fortran_MODULE_DIRECTORY GENERATED GENERATOR_FILE_NAME GLOBAL_DEPENDS_DEBUG_MODE GLOBAL_DEPENDS_NO_CYCLES GNUtoMS HAS_CXX HEADER_FILE_ONLY HELPSTRING IMPLICIT_DEPENDS_INCLUDE_TRANSFORM IMPORTED IMPORTED_CONFIGURATIONS IMPORTED_IMPLIB IMPORTED_IMPLIB_DEBUG IMPORTED_IMPLIB_RELEASE IMPORTED_LINK_DEPENDENT_LIBRARIES IMPORTED_LINK_DEPENDENT_LIBRARIES_DEBUG IMPORTED_LINK_DEPENDENT_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_LANGUAGES IMPORTED_LINK_INTERFACE_LANGUAGES_DEBUG IMPORTED_LINK_INTERFACE_LANGUAGES_RELEASE IMPORTED_LINK_INTERFACE_LIBRARIES IMPORTED_LINK_INTERFACE_LIBRARIES_DEBUG IMPORTED_LINK_INTERFACE_LIBRARIES_RELEASE IMPORTED_LINK_INTERFACE_MULTIPLICITY IMPORTED_LINK_INTERFACE_MULTIPLICITY_DEBUG IMPORTED_LINK_INTERFACE_MULTIPLICITY_RELEASE IMPORTED_LOCATION IMPORTED_LOCATION_DEBUG IMPORTED_LOCATION_RELEASE IMPORTED_NO_SONAME IMPORTED_NO_SONAME_ DEBUG IMPORTED_NO_SONAME_RELEASE IMPORTED_SONAME IMPORTED_SONAME_DEBUG IMPORTED_SONAME_RELEASE
[Cmake-commits] CMake branch, next, updated. v3.7.2-2278-g639429c
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 639429cb85ed679c38223c7be1c4a0dfd3b3de39 (commit) via 82eb1702d16723c4f997ded593cbe7cb0ca75999 (commit) from bb234a4b50ecca06c00ab4f4cebdd44261f25653 (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=639429cb85ed679c38223c7be1c4a0dfd3b3de39 commit 639429cb85ed679c38223c7be1c4a0dfd3b3de39 Merge: bb234a4 82eb170 Author: Domen VrankarAuthorDate: Sat Jan 21 03:36:09 2017 -0500 Commit: CMake Topic Stage CommitDate: Sat Jan 21 03:36:09 2017 -0500 Merge topic 'cpack-stgz-minimal-test' into next 82eb1702 fixup! CPack/STGZ: minimalistic packages test https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82eb1702d16723c4f997ded593cbe7cb0ca75999 commit 82eb1702d16723c4f997ded593cbe7cb0ca75999 Author: Domen Vrankar AuthorDate: Sat Jan 21 09:34:54 2017 +0100 Commit: Domen Vrankar CommitDate: Sat Jan 21 09:34:54 2017 +0100 fixup! CPack/STGZ: minimalistic packages test diff --git a/Tests/RunCMake/CPack/STGZ/Helpers.cmake b/Tests/RunCMake/CPack/STGZ/Helpers.cmake index 96be71b..08224d3 100644 --- a/Tests/RunCMake/CPack/STGZ/Helpers.cmake +++ b/Tests/RunCMake/CPack/STGZ/Helpers.cmake @@ -10,15 +10,8 @@ function(getPackageContent FILE RESULT_VAR) OUTPUT_STRIP_TRAILING_WHITESPACE) if(extract_result_) -find_program(TAIL_EXECUTABLE tail) -find_program(PAX_EXECUTABLE pax) -find_program(GTAR_EXECUTABLE gtar) -find_program(TAR_EXECUTABLE tar) -find_program(GUNZIP_EXECUTABLE gunzip) - -message(FATAL_ERROR "Extracting STGZ archive failed: '${extract_error_}';" -"'${TAIL_EXECUTABLE}'; '${PAX_EXECUTABLE}'; '${GTAR_EXECUTABLE}';" -"'${TAR_EXECUTABLE}'; '${GUNZIP_EXECUTABLE}'") +message(FATAL_ERROR "Extracting STGZ archive failed: '${extract_result_}';" + " '${extract_error_}'.") endif() file(GLOB_RECURSE package_content_ LIST_DIRECTORIES true RELATIVE diff --git a/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake b/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake index 46e7757..3b015ca 100644 --- a/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake +++ b/Tests/RunCMake/CPack/STGZ/Prerequirements.cmake @@ -1,6 +1,11 @@ function(get_test_prerequirements found_var config_file) if(EXISTS "/bin/sh") -file(WRITE "${config_file}" "") -set(${found_var} true PARENT_SCOPE) +#gunzip is not part of posix so we should not rely on it being installed +find_program(GUNZIP_EXECUTABLE gunzip) + +if(GUNZIP_EXECUTABLE) + file(WRITE "${config_file}" "") + set(${found_var} true PARENT_SCOPE) +endif() endif() endfunction() --- Summary of changes: Tests/RunCMake/CPack/STGZ/Helpers.cmake | 11 ++- Tests/RunCMake/CPack/STGZ/Prerequirements.cmake |9 +++-- 2 files changed, 9 insertions(+), 11 deletions(-) hooks/post-receive -- CMake ___ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits