diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-04-21 23:33:00 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-04-21 23:33:00 +0200 |
| commit | 9d724e0fe4bfb7b7940f3f0c9719affd22a18722 (patch) | |
| tree | c73e9566e134d2b78e6f1b8bce3c32159b17675f /cmake | |
| parent | a9dfe6d7ec949954b07facff71ee6023e0ced9ee (diff) | |
| parent | a00fb1e8da505768b491e5f4d6266784fb1a27c9 (diff) | |
| download | MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar.gz MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar.lz MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar.xz MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.zip | |
Merge remote-tracking branch 'origin/feature_cmake_style' into develop
Conflicts:
CMakeLists.txt
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Coverity.cmake | 20 | ||||
| -rw-r--r-- | cmake/GitFunctions.cmake | 8 |
2 files changed, 14 insertions, 14 deletions
diff --git a/cmake/Coverity.cmake b/cmake/Coverity.cmake index 899d9852..1fcec86f 100644 --- a/cmake/Coverity.cmake +++ b/cmake/Coverity.cmake @@ -17,19 +17,19 @@ find_program(CURL_EXECUTABLE NAMES curl PATHS /usr/bin) if(NOT CURL_EXECUTABLE STREQUAL "" AND NOT MultiMC_COVERITY_TOKEN STREQUAL "" AND NOT MultiMC_COVERITY_EMAIL STREQUAL "") add_custom_target(coverity_configure - COMMAND ${MultiMC_COVERITY_TOOLS_DIR}/bin/cov-configure --comptype gcc --compiler ${CMAKE_C_COMPILER} + COMMAND ${MultiMC_COVERITY_TOOLS_DIR}/bin/cov-configure --comptype gcc --compiler ${CMAKE_C_COMPILER} ) add_custom_target(coverity_create_tarball - COMMAND ${CMAKE_COMMAND} -E echo "Cleaning..." && ${CMAKE_MAKE_PROGRAM} clean - COMMAND ${CMAKE_COMMAND} -E echo "Building..." && ${MultiMC_COVERITY_TOOLS_DIR}/bin/cov-build --dir cov-int ${CMAKE_MAKE_PROGRAM} -j3 - COMMAND ${CMAKE_COMMAND} -E echo "Creating tarball..." && ${CMAKE_COMMAND} -E tar cfz multimc_coverity.tgz cov-int/ - COMMENT "Creating coverity build..." - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + COMMAND ${CMAKE_COMMAND} -E echo "Cleaning..." && ${CMAKE_MAKE_PROGRAM} clean + COMMAND ${CMAKE_COMMAND} -E echo "Building..." && ${MultiMC_COVERITY_TOOLS_DIR}/bin/cov-build --dir cov-int ${CMAKE_MAKE_PROGRAM} -j3 + COMMAND ${CMAKE_COMMAND} -E echo "Creating tarball..." && ${CMAKE_COMMAND} -E tar cfz multimc_coverity.tgz cov-int/ + COMMENT "Creating coverity build..." + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) add_custom_target(coverity_upload - COMMAND ${CURL_EXECUTABLE} --form project=02JanDal/MultiMC5 --form token=${MultiMC_COVERITY_TOKEN} --form email=${MultiMC_COVERITY_EMAIL} --form file=@multimc_coverity.tgz --form version=${MultiMC_GIT_COMMIT} --form description=${GIT_VERSION} http://scan5.coverity.com/cgi-bin/upload.py - DEPENDS coverity_create_tarball - COMMENT "Uploading to coverity..." - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + COMMAND ${CURL_EXECUTABLE} --form project=02JanDal/MultiMC5 --form token=${MultiMC_COVERITY_TOKEN} --form email=${MultiMC_COVERITY_EMAIL} --form file=@multimc_coverity.tgz --form version=${MultiMC_GIT_COMMIT} --form description=${GIT_VERSION} http://scan5.coverity.com/cgi-bin/upload.py + DEPENDS coverity_create_tarball + COMMENT "Uploading to coverity..." + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) endif() diff --git a/cmake/GitFunctions.cmake b/cmake/GitFunctions.cmake index e0868725..898e7b01 100644 --- a/cmake/GitFunctions.cmake +++ b/cmake/GitFunctions.cmake @@ -14,10 +14,10 @@ if(GIT_FOUND) cmake_parse_arguments(GIT_RUN "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) execute_process(COMMAND ${GIT_EXECUTABLE} ${GIT_RUN_COMMAND} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} - RESULT_VARIABLE GIT_RESULTVAR - OUTPUT_VARIABLE GIT_OUTVAR - OUTPUT_STRIP_TRAILING_WHITESPACE + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + RESULT_VARIABLE GIT_RESULTVAR + OUTPUT_VARIABLE GIT_OUTVAR + OUTPUT_STRIP_TRAILING_WHITESPACE ) if(GIT_RESULTVAR EQUAL 0) |