diff options
| author | Josh Blum | 2011-11-09 06:50:50 -0800 |
|---|---|---|
| committer | Josh Blum | 2011-11-09 06:50:50 -0800 |
| commit | 9a25332b706b1ffadf8cdf9b405e89c37a1e2278 (patch) | |
| tree | e4f7dbbdd23fd5ad4a98ba9db640ea87979c90a0 /gr-howto-write-a-block-cmake | |
| parent | 3de9e901ae188c305745880645118e5952bdbbde (diff) | |
| download | gnuradio-9a25332b706b1ffadf8cdf9b405e89c37a1e2278.tar.gz gnuradio-9a25332b706b1ffadf8cdf9b405e89c37a1e2278.tar.bz2 gnuradio-9a25332b706b1ffadf8cdf9b405e89c37a1e2278.zip | |
cmake: only rely on target trick when not cross
Diffstat (limited to 'gr-howto-write-a-block-cmake')
| -rw-r--r-- | gr-howto-write-a-block-cmake/cmake/Modules/GrMiscUtils.cmake | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/gr-howto-write-a-block-cmake/cmake/Modules/GrMiscUtils.cmake b/gr-howto-write-a-block-cmake/cmake/Modules/GrMiscUtils.cmake index 540b97b93..0e1f40027 100644 --- a/gr-howto-write-a-block-cmake/cmake/Modules/GrMiscUtils.cmake +++ b/gr-howto-write-a-block-cmake/cmake/Modules/GrMiscUtils.cmake @@ -164,6 +164,7 @@ function(GR_LIBRARY_FOO target) POST_BUILD COMMAND ${CMAKE_COMMAND} -E create_symlink ${target_name} ${CMAKE_CURRENT_BINARY_DIR}/lib${target}.so COMMAND ${CMAKE_COMMAND} -E create_symlink ${target_name} ${CMAKE_CURRENT_BINARY_DIR}/lib${target}-${LIBVER}.so.0 + COMMAND ${CMAKE_COMMAND} -E touch ${target_name} #so the symlinks point to something valid so cmake 2.6 will install ) #and install the extra symlinks @@ -200,5 +201,10 @@ function(GR_GEN_TARGET_DEPS name var) if(ARGN) add_dependencies(${name} ${ARGN}) endif(ARGN) - set(${var} "DEPENDS;${name};COMMAND;${name}" PARENT_SCOPE) + + if(CMAKE_CROSSCOMPILING) + set(${var} "DEPENDS;${name}" PARENT_SCOPE) #cant call command when cross + else() + set(${var} "DEPENDS;${name};COMMAND;${name}" PARENT_SCOPE) + endif() endfunction(GR_GEN_TARGET_DEPS) |