ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove my DESTDIR hack from the cmake build. It turns out this is built into cmake and works in the same way it does with the gnu autotools. Use it in the standard way with "make DESTDIR=/desired/location install". 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6382 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-11-11 15:50:52 +00:00
parent d4b72eaae5
commit c6d95c9087
5 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -11,7 +11,6 @@ set(bindir ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "bindir")
set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "libdir") set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "libdir")
set(plugindir ${libdir}/dolphin-emu CACHE PATH "plugindir") set(plugindir ${libdir}/dolphin-emu CACHE PATH "plugindir")
set(datadir ${CMAKE_INSTALL_PREFIX}/share/dolphin-emu CACHE PATH "datadir") set(datadir ${CMAKE_INSTALL_PREFIX}/share/dolphin-emu CACHE PATH "datadir")
set(DESTDIR ${DESTDIR} CACHE STRING "Leave blank unless building packages")
# Set up paths # Set up paths
set(userdir ".dolphin-emu" CACHE STRING "User directory") set(userdir ".dolphin-emu" CACHE STRING "User directory")
@ -341,12 +340,11 @@ add_subdirectory(Source)
######################################## ########################################
# Install shared data files # Install shared data files
# #
install(DIRECTORY Data/User/ DESTINATION ${DESTDIR}${datadir}/user PATTERN .svn EXCLUDE) install(DIRECTORY Data/User/ DESTINATION ${datadir}/user PATTERN .svn EXCLUDE)
install(DIRECTORY Data/Sys/ DESTINATION ${DESTDIR}${datadir}/sys PATTERN .svn EXCLUDE) install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN .svn EXCLUDE)
install(FILES Data/license.txt DESTINATION ${DESTDIR}${datadir}) install(FILES Data/license.txt DESTINATION ${datadir})
# packaging information # packaging information
include(CPack)
set(CPACK_PACKAGE_NAME "dolphin-emu") set(CPACK_PACKAGE_NAME "dolphin-emu")
set(CPACK_PACKAGE_VENDOR "Dolphin Team") set(CPACK_PACKAGE_VENDOR "Dolphin Team")
set(CPACK_PACKAGE_VERSION_MAJOR "2") set(CPACK_PACKAGE_VERSION_MAJOR "2")
@ -366,3 +364,7 @@ endif()
# TODO: CPACK_PACKAGE_ICON # TODO: CPACK_PACKAGE_ICON
# TODO: CPACK_NSIS_* # TODO: CPACK_NSIS_*
# TODO: Use CPack components for DSPSpy, etc => cpack_add_component # TODO: Use CPack components for DSPSpy, etc => cpack_add_component
# CPack must be included after the CPACK_* variables are set in order for those
# variables to take effect.
include(CPack)

4
Source/Core/DolphinWX/CMakeLists.txt
View File

@ -77,9 +77,9 @@ if(wxWidgets_FOUND)
add_library(memcard STATIC ${MEMCARDSRCS}) add_library(memcard STATIC ${MEMCARDSRCS})
add_executable(${EXEGUI} ${SRCS}) add_executable(${EXEGUI} ${SRCS})
target_link_libraries(${EXEGUI} ${LIBS} ${WXLIBS}) target_link_libraries(${EXEGUI} ${LIBS} ${WXLIBS})
install(TARGETS ${EXEGUI} RUNTIME DESTINATION ${DESTDIR}${bindir}) install(TARGETS ${EXEGUI} RUNTIME DESTINATION ${bindir})
else() else()
add_executable(${EXENOGUI} ${SRCS}) add_executable(${EXENOGUI} ${SRCS})
target_link_libraries(${EXENOGUI} ${LIBS}) target_link_libraries(${EXENOGUI} ${LIBS})
install(TARGETS ${EXENOGUI} RUNTIME DESTINATION ${DESTDIR}${bindir}) install(TARGETS ${EXENOGUI} RUNTIME DESTINATION ${bindir})
endif() endif()

4
Source/Plugins/Plugin_DSP_HLE/CMakeLists.txt
View File

@ -23,5 +23,5 @@ endif(wxWidgets_FOUND)
add_library(Plugin_DSP_HLE SHARED ${SRCS}) add_library(Plugin_DSP_HLE SHARED ${SRCS})
target_link_libraries(Plugin_DSP_HLE common audiocommon) target_link_libraries(Plugin_DSP_HLE common audiocommon)
install(TARGETS Plugin_DSP_HLE install(TARGETS Plugin_DSP_HLE
LIBRARY DESTINATION ${DESTDIR}${plugindir} LIBRARY DESTINATION ${plugindir}
RUNTIME DESTINATION ${DESTDIR}${plugindir}) RUNTIME DESTINATION ${plugindir})

4
Source/Plugins/Plugin_DSP_LLE/CMakeLists.txt
View File

@ -21,6 +21,6 @@ endif(wxWidgets_FOUND)
add_library(Plugin_DSP_LLE SHARED ${SRCS}) add_library(Plugin_DSP_LLE SHARED ${SRCS})
target_link_libraries(Plugin_DSP_LLE ${LIBS}) target_link_libraries(Plugin_DSP_LLE ${LIBS})
install(TARGETS Plugin_DSP_LLE install(TARGETS Plugin_DSP_LLE
LIBRARY DESTINATION ${DESTDIR}${plugindir} LIBRARY DESTINATION ${plugindir}
RUNTIME DESTINATION ${DESTDIR}${plugindir}) RUNTIME DESTINATION ${plugindir})

4
Source/Plugins/Plugin_VideoOGL/CMakeLists.txt
View File

@ -37,5 +37,5 @@ endif()
add_library(Plugin_VideoOGL SHARED ${SRCS}) add_library(Plugin_VideoOGL SHARED ${SRCS})
target_link_libraries(Plugin_VideoOGL ${LIBS}) target_link_libraries(Plugin_VideoOGL ${LIBS})
install(TARGETS Plugin_VideoOGL install(TARGETS Plugin_VideoOGL
LIBRARY DESTINATION ${DESTDIR}${plugindir} LIBRARY DESTINATION ${plugindir}
RUNTIME DESTINATION ${DESTDIR}${plugindir}) RUNTIME DESTINATION ${plugindir})