From 57361e2943811a4301c24a11d7492a72199fb6e3 Mon Sep 17 00:00:00 2001 From: Peter Tissen Date: Thu, 15 Jan 2015 04:00:43 +0100 Subject: [PATCH 1/2] forgot to remove somicolon --- rpcs3/git-version.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/git-version.cmake b/rpcs3/git-version.cmake index e6b5c86f90..82474cd014 100644 --- a/rpcs3/git-version.cmake +++ b/rpcs3/git-version.cmake @@ -33,7 +33,7 @@ if(EXISTS ${GIT_VERSION_FILE}) endif() set(code_string "// This is a generated file.\n\n" - "#define RPCS3_GIT_VERSION \"${GIT_VERSION}\"\;\n\n" + "#define RPCS3_GIT_VERSION \"${GIT_VERSION}\"\n\n" "// If you don't want this file to update/recompile, change to 1.\n" "#define RPCS3_GIT_VERSION_NO_UPDATE 0\n") From 1cf4791f95d95f419a8be81cc1b478444ab0bd00 Mon Sep 17 00:00:00 2001 From: Dante38490 Date: Thu, 15 Jan 2015 04:03:25 +0100 Subject: [PATCH 2/2] Fix correct PATH --- rpcs3/CMakeLists.txt | 2 +- rpcs3/git-version.cmake | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt index c6eb5643db..c5e6ebe4a0 100644 --- a/rpcs3/CMakeLists.txt +++ b/rpcs3/CMakeLists.txt @@ -5,7 +5,7 @@ include(cotire) project(rpcs3) -# Generate git-version.cpp at build time. +# Generate git-version.h at build time. add_custom_target(GitVersion ALL DEPENDS something_that_never_exists) add_custom_command(OUTPUT something_that_never_exists diff --git a/rpcs3/git-version.cmake b/rpcs3/git-version.cmake index e6b5c86f90..1382a9cb18 100644 --- a/rpcs3/git-version.cmake +++ b/rpcs3/git-version.cmake @@ -1,4 +1,4 @@ -set(GIT_VERSION_FILE "${SOURCE_DIR}/git-version.h") +set(GIT_VERSION_FILE "${SOURCE_DIR}/rpcs3/git-version.h") set(GIT_VERSION "unknown") set(GIT_VERSION_UPDATE "1")