remove python dependency of version.cmake and correct the path

shogun-toolbox · Jan 31, 2018 · 7c55b8b · 7c55b8b
1 parent 6db834f
commit 7c55b8b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/cmake/version.cmake b/cmake/version.cmake
@@ -69,10 +69,7 @@ ELSEIF(EXISTS "${ROOT_DIR}/NEWS")
 		SET(VERSION_SUB "0${VERSION_SUB}")
 	ENDIF()
 	SET(REVISION ${VERSION_MAJOR}${VERSION_MINOR}${VERSION_SUB})
-	EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import os.path,time;print (time.strftime('%Y-%m-%d %H:%M', time.gmtime(os.path.getmtime('${ROOT_DIR}/NEWS'))))"
-		OUTPUT_VARIABLE DATEINFO
-		OUTPUT_STRIP_TRAILING_WHITESPACE
-	)
+	FILE(TIMESTAMP "${ROOT_DIR}/NEWS" DATEINFO "%Y-%m-%d %H:%M")
 	STRING(REGEX REPLACE "([0-9]+)-.*" "\\1" VERSION_YEAR "${DATEINFO}")
 	STRING(REGEX REPLACE ".*-0*([0-9]+)-.*" "\\1" VERSION_MONTH "${DATEINFO}")
 	STRING(REGEX REPLACE ".*-.*-0*([0-9]+).*" "\\1" VERSION_DAY "${DATEINFO}")

diff --git a/src/shogun/CMakeLists.txt b/src/shogun/CMakeLists.txt
@@ -69,8 +69,7 @@ ADD_CUSTOM_TARGET(
       -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/lib/versionstring.h.in
       -D DST=${CMAKE_CURRENT_BINARY_DIR}/lib/versionstring.h
       -D ROOT_DIR=${CMAKE_SOURCE_DIR}
-      -D PYTHON_EXECUTABLE=${PYTHON_EXECUTABLE}
-      -P ${CMAKE_MODULE_PATH}/version.cmake
+      -P ${CMAKE_SOURCE_DIR}/cmake/version.cmake
     COMMENT "Generating version header"
 )
 add_dependencies(libshogun version)