Skip to content

Commit

Permalink
[cmake] - only evaluate the sudo check on linux. On darwin with cmake…
Browse files Browse the repository at this point in the history
… 2.8.12 the execute_process with the multiple commands inside doesn't seem to work (it detects that it needs sudo and so it doesn't install into the addons dir). Bumping to cmake 3.2.2 was an other solution which made it work but bumping cmake is considered to dangerous at this stage. Fixes missing addons on ios and osx builds.
  • Loading branch information
Memphiz committed May 4, 2015
1 parent 7093903 commit 5c57210
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion project/cmake/addons/CMakeLists.txt
Expand Up @@ -122,7 +122,7 @@ include(${APP_ROOT}/project/cmake/scripts/common/check_target_platform.cmake)
# check install permissions
set(ADDON_INSTALL_DIR ${CMAKE_INSTALL_PREFIX})
check_install_permissions(${CMAKE_INSTALL_PREFIX} can_write)
if(NOT ${can_write} AND NOT WIN32)
if(NOT ${can_write} AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(NEED_SUDO TRUE)
set(ADDON_INSTALL_DIR ${CMAKE_BINARY_DIR}/.install)
message(STATUS "NEED_SUDO: ${NEED_SUDO}")
Expand Down

0 comments on commit 5c57210

Please sign in to comment.