Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Set cmake RPATH policy to OLD 0.9.23
authorkoda
Wed, 10 Jan 2018 01:14:13 +0100
branch0.9.23
changeset 12887 62f7d28e93e3
parent 12874 7caa4ec513bd
child 12888 41d147eb26ea
Set cmake RPATH policy to OLD
CMakeLists.txt file | annotate | diff | comparison | revisions
tools/CreateMacBundle.cmake.in file | annotate | diff | comparison | revisions 
--- a/CMakeLists.txt	Tue Jan 02 23:20:50 2018 +0300
+++ b/CMakeLists.txt	Wed Jan 10 01:14:13 2018 +0100
@@ -9,7 +9,7 @@
     endif()
 endforeach()
 
-foreach(hwpolicy CMP0026)
+foreach(hwpolicy CMP0026 CMP0068)
     if(POLICY ${hwpolicy})
         cmake_policy(SET ${hwpolicy} OLD)
     endif()
--- a/tools/CreateMacBundle.cmake.in	Tue Jan 02 23:20:50 2018 +0300
+++ b/tools/CreateMacBundle.cmake.in	Wed Jan 10 01:14:13 2018 +0100
@@ -18,17 +18,23 @@
         # same here, for libpng and hwengine, let's assume the version pulled
         # by macdeployqt matches (yes, libpng is pulled in by macdeployqt even
         # when NOVIDEOREC is ON)
-        execute_process(COMMAND install_name_tool -change ${PNG_LIBRARY} @executable_path/../Frameworks/${PNG_LIBNAME} ${engine_full_path})
-        execute_process(COMMAND install_name_tool -change ${ZLIB_LIBRARY} @executable_path/../Frameworks/${ZLIB_LIBNAME} ${engine_full_path})
+        execute_process(COMMAND install_name_tool -change ${PNG_LIBRARY} @executable_path/../Frameworks/libpng16.16.dylib ${engine_full_path})
+        #execute_process(COMMAND install_name_tool -change ${ZLIB_LIBRARY} @executable_path/../Frameworks/${ZLIB_LIBNAME} ${engine_full_path})
     endif()
 
     execute_process(COMMAND cp ${PNG_LIBRARY} ${frameworks_dir})
 
     execute_process(COMMAND cp -pPR ${sdl_library_only}  ${frameworks_dir})
+    execute_process(COMMAND install_name_tool -change ${sdl_library_only} @executable_path/../Frameworks/libSDL2-2.0.0.dylib  ${engine_full_path})
     execute_process(COMMAND cp -pPR ${SDL2_IMAGE_LIBRARIES} ${frameworks_dir})
+    execute_process(COMMAND install_name_tool -change ${SDL2_IMAGE_LIBRARIES} @executable_path/../Frameworks/libSDL2_image-2.0.0.dylib  ${engine_full_path})
     execute_process(COMMAND cp -pPR ${SDL2_NET_LIBRARIES}   ${frameworks_dir})
+    execute_process(COMMAND install_name_tool -change ${SDL2_NET_LIBRARIES} @executable_path/../Frameworks/libSDL2_net-2.0.0.dylib  ${engine_full_path})
     execute_process(COMMAND cp -pPR ${SDL2_TTF_LIBRARIES}   ${frameworks_dir})
+    execute_process(COMMAND install_name_tool -change ${SDL2_TTF_LIBRARIES} @executable_path/../Frameworks/libSDL2_ttf-2.0.0.dylib  ${engine_full_path})
     execute_process(COMMAND cp -pPR ${SDL2_MIXER_LIBRARIES} ${frameworks_dir})
+    execute_process(COMMAND install_name_tool -change ${SDL2_MIXER_LIBRARIES} @executable_path/../Frameworks/libSDL2_mixer-2.0.0.dylib  ${engine_full_path})
+
     execute_process(COMMAND cp -pPR ${OGG_LIBRARY}       ${frameworks_dir})
     execute_process(COMMAND cp -pPR ${VORBIS_LIBRARY}    ${frameworks_dir})
hedgewars