equal
deleted
inserted
replaced
59 set(CMAKE_INSTALL_RPATH "$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/") |
59 set(CMAKE_INSTALL_RPATH "$ORIGIN/../${target_library_install_dir}/:$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/") |
60 #\\\\ is just \\ which escapes '\' in the final script; same for $$ which escapes '$' in cmake |
60 #\\\\ is just \\ which escapes '\' in the final script; same for $$ which escapes '$' in cmake |
61 set(CMAKE_INSTALL_RPATH_ESCAPED "\\\\$$ORIGIN/../${target_library_install_dir}/:\\\\$$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/") |
61 set(CMAKE_INSTALL_RPATH_ESCAPED "\\\\$$ORIGIN/../${target_library_install_dir}/:\\\\$$ORIGIN/:${CMAKE_INSTALL_PREFIX}/${target_library_install_dir}/") |
62 |
62 |
63 if(UNIX AND NOT APPLE) |
63 if(UNIX AND NOT APPLE) |
64 #make sure $ORIGIN is respected |
64 if(CMAKE_COMPILER_IS_GNUCC) |
65 add_linker_flag("-zorigin") |
65 #make sure $ORIGIN is respected |
|
66 add_linker_flag("-zorigin") |
|
67 endif() |
66 #apply RPATH settings to pascal executables |
68 #apply RPATH settings to pascal executables |
67 add_flag_append(CMAKE_Pascal_FLAGS "-k-rpath -k'${CMAKE_INSTALL_RPATH_ESCAPED}'") |
69 add_flag_append(CMAKE_Pascal_FLAGS "-k-rpath -k'${CMAKE_INSTALL_RPATH_ESCAPED}'") |
68 #until we link with external things there is no need to set rpath on haskell |
70 #until we link with external things there is no need to set rpath on haskell |
69 #list(APPEND haskell_flags "-optl" "-Wl,-rpath,'${CMAKE_INSTALL_RPATH_ESCAPED}'") |
71 #list(APPEND haskell_flags "-optl" "-Wl,-rpath,'${CMAKE_INSTALL_RPATH_ESCAPED}'") |
70 endif() |
72 endif() |