cmake version:

Use same version as window based on git
drop subversion code
use lld on onepad
This commit is contained in:
Gregory Hainaut 2014-03-25 17:29:47 +01:00
parent 8b78551b92
commit 4496093cf8
3 changed files with 11 additions and 10 deletions

View File

@ -38,16 +38,17 @@ function(detectOperatingSystem)
endfunction(detectOperatingSystem)
function(write_svnrev_h)
# you must have both svn client executable and a source that contains svn metadata
if(Subversion_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.svn")
# execute subversion
Subversion_WC_INFO(${CMAKE_SOURCE_DIR} tmpvar)
if (GIT_FOUND)
execute_process(COMMAND git show -s --format=%%%ci HEAD
OUTPUT_VARIABLE tmpvar_WC_INFO
OUTPUT_STRIP_TRAILING_WHITESPACE)
# %2014-03-25 16:36:29 +0100
string(REGEX REPLACE "[%:\\-]" "" tmpvar_WC_INFO "${tmpvar_WC_INFO}")
string(REGEX REPLACE "([0-9]+) ([0-9]+).*" "\\1\\2" tmpvar_WC_INFO "${tmpvar_WC_INFO}")
# write svnrev.h
file(WRITE ${CMAKE_BINARY_DIR}/common/include/svnrev.h "#define SVN_REV ${tmpvar_WC_REVISION} \n#define SVN_MODS 0")
file(WRITE ${CMAKE_BINARY_DIR}/common/include/svnrev.h "#define SVN_REV ${tmpvar_WC_INFO}ll \n#define SVN_MODS 0")
else()
# write svnrev.h
file(WRITE ${CMAKE_BINARY_DIR}/common/include/svnrev.h "#define SVN_REV 0 \n#define SVN_MODS 0")
file(WRITE ${CMAKE_BINARY_DIR}/common/include/svnrev.h "#define SVN_REV_UNKNOWN\n#define SVN_REV 0ll \n#define SVN_MODS 0")
endif()
endfunction()

View File

@ -28,12 +28,12 @@ endif(Linux)
find_package(ALSA)
find_package(BZip2)
find_package(Gettext) # translation tool
find_package(Git)
find_package(JPEG)
find_package(OpenGL)
# Tell cmake that we use SDL as a library and not as an application
set(SDL_BUILDING_LIBRARY TRUE)
find_package(SDL)
find_package(Subversion)
# The requirement of wxWidgets is checked in SelectPcsx2Plugins module
# Does not require the module (allow to compile non-wx plugins)
# Force the unicode build (the variable is only supported on cmake 2.8.3 and above)

View File

@ -146,7 +146,7 @@ static void InitLibraryName()
// Use TortoiseSVN's SubWCRev utility's output
// to label the specific revision:
snprintf(libraryName, 255, "OnePAD r%d%s"
snprintf(libraryName, 255, "OnePAD %lld%s"
# ifdef PCSX2_DEBUG
"-Debug"
# else