Skip to content

Commit

Permalink
fix debug messages and small error in cmake scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
boucman committed Oct 17, 2015
1 parent 77bc9e0 commit f8115ea
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,17 +94,15 @@ endif()
#

if(DEFINED PROJECT_VERSION)
message("here 1")
#project version is defined by -D on the cmake command line
# only use that value, do not upate it at make time
EXECUTE_PROCESS( COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools/create_version_h.sh ${CMAKE_CURRENT_BINARY_DIR}/src/version_gen.h ${PROJECT_VERSION}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
else(DEFINED PROJECT_VERSION)
if(NOT SOURCE_PACKAGE)
message("here 2")
# this part is setting the corresponding CMake variable which gets used for example when creating a source package
EXECUTE_PROCESS(COMMAND git describe --tags --dirty HEAD
EXECUTE_PROCESS(COMMAND git describe --tags --dirty
COMMAND sed "s,^release-,,;s,-,+,;s,-,~,;" OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE PROJECT_VERSION
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
add_custom_target(
Expand All @@ -114,15 +112,13 @@ else(DEFINED PROJECT_VERSION)
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
else(NOT SOURCE_PACKAGE)
message("here 3")
set(PROJECT_VERSION "archive-$Format:%H$")
execute_process( COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/tools/create_version_h.sh ${CMAKE_CURRENT_BINARY_DIR}/src/version_gen.h ${PROJECT_VERSION}
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
)
endif(NOT SOURCE_PACKAGE)
endif(DEFINED PROJECT_VERSION)

message("here 4")

#
# Initial cmake/debian/postinst and prerm script for debian package
Expand Down

0 comments on commit f8115ea

Please sign in to comment.