iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

Revert to revision 5660

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5782 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 66a95ba5d6c22d19dfeec06791aede679aba63e2
Former-commit-id: 558486eff31331db882dee3fc615682be7be4bd9
This commit is contained in:
beaglejoe 2014-06-21 23:01:18 +00:00
parent 4690cc2d98
commit e5fe431239
1 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
cmake/install.cmake
View file

@ -176,7 +176,7 @@ MACRO(SD_UPDATE_SETTINGS_VERSION)
ENDFOREACH()
# Install version.xml
INSTALL(FILES "${CMAKE_BINARY_DIR}/${SD_BINDIR}/version.xml" DESTINATION "${SD_DATADIR}")
INSTALL(FILES "${CMAKE_BINARY_DIR}/${SD_BINDIR}/version.xml" DESTINATION "${SD_DATADIR_ABS}")
ENDMACRO(SD_UPDATE_SETTINGS_VERSION)
@ -450,23 +450,15 @@ ENDMACRO(SD_INSTALL_DIRECTORIES)
# Macro to install CMake config files for SD if in-source build.
IF(IN_SOURCETREE)
MACRO(INSTALL_SD_CMAKE)
MESSAGE(STATUS "SD_DATADIR_ABS = ${SD_DATADIR_ABS}")
MESSAGE(STATUS "SD_DATADIR = ${SD_DATADIR}")
MESSAGE(STATUS "CMAKE_INSTALL_PREFIX = ${CMAKE_INSTALL_PREFIX}")
INSTALL(CODE
"SET(CUR_DESTDIR \"\$ENV{DESTDIR}\")
MESSAGE(STATUS \"SD_DATADIR_ABS = ${SD_DATADIR_ABS}\")
MESSAGE(STATUS \"SD_DATADIR = ${SD_DATADIR}\")
MESSAGE(STATUS \"CUR_DESTDIR = ${CUR_DESTDIR}\")
IF(CUR_DESTDIR MATCHES \"[^/]\")
STRING(REGEX REPLACE \"^(.*[^/])/*$\" \"\\\\1\" CUR_DESTDIR_CORR \"\${CUR_DESTDIR}\")
ELSE(CUR_DESTDIR MATCHES \"[^/]\")
SET(CUR_DESTDIR_CORR \"${CMAKE_INSTALL_PREFIX}\")
ENDIF(CUR_DESTDIR MATCHES \"[^/]\")
MESSAGE(STATUS \"CUR_DESTDIR_CORR = ${CUR_DESTDIR_CORR}\")
FILE(MAKE_DIRECTORY \"\${CUR_DESTDIR_CORR}/${SD_DATADIR}/cmake\")
FILE(WRITE \"\${CUR_DESTDIR_CORR}/${SD_DATADIR}/cmake/speed-dreams.cmake\"
SET(CUR_DESTDIR_CORR \"\")
ENDIF(CUR_DESTDIR MATCHES \"[^/]\")
FILE(MAKE_DIRECTORY \"\${CUR_DESTDIR_CORR}${SD_DATADIR_ABS}/cmake\")
FILE(WRITE \"\${CUR_DESTDIR_CORR}${SD_DATADIR_ABS}/cmake/speed-dreams.cmake\"
\"SET(SD_DATADIR_ABS \\\"${SD_DATADIR_ABS}\\\")
SET(SD_LOCALDIR \\\"${SD_LOCALDIR}\\\")
SET(SD_LIBDIR_ABS \\\"${SD_LIBDIR_ABS}\\\")
@ -474,10 +466,7 @@ IF(IN_SOURCETREE)
SET(SD_INCLUDEDIR_ABS \\\"${SD_INCLUDEDIR_ABS}\\\")
SET(IN_SOURCETREE FALSE)\\n\\n\")
FILE(READ \"${SOURCE_DIR}/cmake/macros.cmake\" SD_MACRO_CONTENT)
FILE(APPEND \"\${CUR_DESTDIR_CORR}/${SD_DATADIR}/cmake/speed-dreams.cmake\" \${SD_MACRO_CONTENT})")
MESSAGE(STATUS "CUR_DESTDIR = ${CUR_DESTDIR}")
MESSAGE(STATUS "CUR_DESTDIR_CORR = ${CUR_DESTDIR_CORR}")
MESSAGE(STATUS "INSTALL_SD_CMAKE called")
FILE(APPEND \"\${CUR_DESTDIR_CORR}${SD_DATADIR_ABS}/cmake/speed-dreams.cmake\" \${SD_MACRO_CONTENT})")
ENDMACRO(INSTALL_SD_CMAKE)
ENDIF(IN_SOURCETREE)