Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of https://github.com/omf/io

  • Loading branch information...
commit 0a7840665e9a4a648e065989f4c4ae5cce2a05ef 2 parents b4b7fff + 70c9da2
@stevedekorte authored
Showing with 1,232 additions and 146 deletions.
  1. +100 −0 CMakeLists.txt
  2. +2 −2 addons/AVCodec/CMakeLists.txt
  3. +2 −2 addons/AsyncRequest/CMakeLists.txt
  4. +2 −2 addons/BigNum/CMakeLists.txt
  5. +2 −2 addons/Bitly/CMakeLists.txt
  6. +2 −2 addons/Blowfish/CMakeLists.txt
  7. +2 −2 addons/Box/CMakeLists.txt
  8. +2 −2 addons/CFFI/CMakeLists.txt
  9. +2 −2 addons/CGI/CMakeLists.txt
  10. +2 −2 addons/Cairo/CMakeLists.txt
  11. +2 −2 addons/Clutter/CMakeLists.txt
  12. +2 −2 addons/ContinuedFraction/CMakeLists.txt
  13. +2 −2 addons/Curses/CMakeLists.txt
  14. +2 −2 addons/DBI/CMakeLists.txt
  15. +2 −2 addons/DistributedObjects/CMakeLists.txt
  16. +2 −2 addons/EditLine/CMakeLists.txt
  17. +2 −2 addons/Facebook/CMakeLists.txt
  18. +2 −2 addons/Flux/CMakeLists.txt
  19. +2 −2 addons/Fnmatch/CMakeLists.txt
  20. +2 −2 addons/Font/CMakeLists.txt
  21. +2 −2 addons/GLFW/CMakeLists.txt
  22. +2 −2 addons/GoogleSearch/CMakeLists.txt
  23. +2 −2 addons/HttpClient/CMakeLists.txt
  24. +2 −2 addons/Image/CMakeLists.txt
  25. +2 −2 addons/LZO/CMakeLists.txt
  26. +2 −2 addons/LibSndFile/CMakeLists.txt
  27. +2 −2 addons/Libxml2/CMakeLists.txt
  28. +2 −2 addons/Loki/CMakeLists.txt
  29. +2 −2 addons/Loudmouth/CMakeLists.txt
  30. +2 −2 addons/MD5/CMakeLists.txt
  31. +2 −2 addons/Memcached/CMakeLists.txt
  32. +2 −2 addons/MySQL/CMakeLists.txt
  33. +2 −2 addons/NotificationCenter/CMakeLists.txt
  34. +2 −2 addons/ODE/CMakeLists.txt
  35. +3 −3 addons/Oauth/CMakeLists.txt
  36. +2 −2 addons/Obsidian/CMakeLists.txt
  37. +2 −2 addons/Ogg/CMakeLists.txt
  38. +2 −2 addons/OpenGL/CMakeLists.txt
  39. +2 −2 addons/PostgreSQL/CMakeLists.txt
  40. +2 −2 addons/Python/CMakeLists.txt
  41. +2 −2 addons/QDBM/CMakeLists.txt
  42. +2 −2 addons/Random/CMakeLists.txt
  43. +2 −2 addons/Range/CMakeLists.txt
  44. +2 −2 addons/Rational/CMakeLists.txt
  45. +2 −2 addons/ReadLine/CMakeLists.txt
  46. +2 −2 addons/Regex/CMakeLists.txt
  47. +2 −2 addons/SGML/CMakeLists.txt
  48. +2 −2 addons/SHA1/CMakeLists.txt
  49. +2 −2 addons/SQLite3/CMakeLists.txt
  50. +2 −2 addons/SampleRateConverter/CMakeLists.txt
  51. +2 −2 addons/SecureSocket/CMakeLists.txt
  52. +2 −2 addons/Socket/CMakeLists.txt
  53. +6 −6 addons/Socket/io/A1_Socket.io
  54. +3 −0  addons/Socket/io/A2_Server.io
  55. +2 −2 addons/SqlDatabase/CMakeLists.txt
  56. +2 −2 addons/Syslog/CMakeLists.txt
  57. +2 −2 addons/SystemCall/CMakeLists.txt
  58. +2 −2 addons/TagLib/CMakeLists.txt
  59. +2 −2 addons/Theora/CMakeLists.txt
  60. +2 −2 addons/Thread/CMakeLists.txt
  61. +2 −2 addons/TokyoCabinet/CMakeLists.txt
  62. +2 −2 addons/Twitter/CMakeLists.txt
  63. +2 −2 addons/UUID/CMakeLists.txt
  64. +2 −2 addons/User/CMakeLists.txt
  65. +2 −2 addons/VertexDB/CMakeLists.txt
  66. +2 −2 addons/Volcano/CMakeLists.txt
  67. +2 −2 addons/Vorbis/CMakeLists.txt
  68. +2 −2 addons/Yajl/CMakeLists.txt
  69. +2 −2 addons/Zlib/CMakeLists.txt
  70. +1 −1  libs/basekit/CMakeLists.txt
  71. +1 −1  libs/coroutine/CMakeLists.txt
  72. +1 −1  libs/garbagecollector/CMakeLists.txt
  73. +1 −1  libs/iovm/CMakeLists.txt
  74. +7 −0 libs/iovm/source/IoDirectory.c
  75. +6 −2 libs/iovm/source/IoSystem.c
  76. +972 −0 modules/NSIS.template.in
  77. +1 −1  tools/CMakeLists.txt
View
100 CMakeLists.txt
@@ -109,3 +109,103 @@ copy_files(coroutine_headers ${PROJECT_SOURCE_DIR}/libs/coroutine/source/*.h ${C
copy_files(basekit_headers ${PROJECT_SOURCE_DIR}/libs/basekit/source/*.h ${CMAKE_CURRENT_BINARY_DIR}/_build/headers)
copy_files(garbagecollector_headers ${PROJECT_SOURCE_DIR}/libs/garbagecollector/source/*.h ${CMAKE_CURRENT_BINARY_DIR}/_build/headers)
copy_files(iovm_headers ${PROJECT_SOURCE_DIR}/libs/iovm/source/*.h ${CMAKE_CURRENT_BINARY_DIR}/_build/headers)
+
+
+# Packaging stuff
+
+#Modified from: http://www.mail-archive.com/cmake@cmake.org/msg32916.html
+MACRO (TODAY RESULT)
+ IF (WIN32)
+ EXECUTE_PROCESS(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE ${RESULT})
+ string(REGEX REPLACE "(..)/(..)/(....).*" "\\1.\\2.\\3" ${RESULT}
+${${RESULT}})
+ ELSEIF(UNIX)
+ EXECUTE_PROCESS(COMMAND "date" "+%d/%m/%Y" OUTPUT_VARIABLE ${RESULT})
+ string(REGEX REPLACE "(..)/(..)/(....).*" "\\1.\\2.\\3" ${RESULT}
+${${RESULT}})
+ ELSE (WIN32)
+ MESSAGE(SEND_ERROR "date not implemented")
+ SET(${RESULT} 000000)
+ ENDIF (WIN32)
+ENDMACRO (TODAY)
+
+TODAY(CMD_DATE)
+STRING(SUBSTRING ${CMD_DATE} 0 2 CMD_DATE_DAY)
+STRING(SUBSTRING ${CMD_DATE} 3 2 CMD_DATE_MON)
+STRING(SUBSTRING ${CMD_DATE} 6 4 CMD_DATE_YEAR)
+SET(CMD_DATE "${CMD_DATE_YEAR}.${CMD_DATE_MON}.${CMD_DATE_DAY}")
+
+IF(WIN32 AND NOT CYGWIN)
+ execute_process(COMMAND "cmd" " /C git rev-parse --short HEAD" OUTPUT_VARIABLE IO_GIT_REV)
+ELSE(WIN32 AND NOT CYGWIN)
+ execute_process(COMMAND git rev-parse --short HEAD OUTPUT_VARIABLE IO_GIT_REV)
+ENDIF(WIN32 AND NOT CYGWIN)
+string(REGEX REPLACE "(.......)." "\\1" IO_GIT_REV ${IO_GIT_REV})
+
+SET(CPACK_PACKAGE_NAME ${PROJECT_NAME})
+SET(CPACK_PACKAGE_VENDOR "iolanguage.com")
+SET(CPACK_PACKAGE_CONTACT "iolanguage@yahoogroups.com")
+SET(CPACK_RESOURCE_FILE_LICENSE ${PROJECT_SOURCE_DIR}/license/bsd_license.txt)
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Io Language")
+SET(CPACK_PACKAGE_VERSION "${CMD_DATE}_${IO_GIT_REV}")
+SET(CPACK_PACKAGE_VERSION_MAJOR ${CMD_DATE_YEAR})
+SET(CPACK_PACKAGE_VERSION_MINOR ${CMD_DATE_MON})
+SET(CPACK_PACKAGE_VERSION_PATCH ${CMD_DATE_DAY})
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
+
+IF(WIN32)
+ # It's not very clear whether redist files for MSVC build are in the path bellow...
+ # The semi-hardcoded path bellow is for Visual Studio 2008 Express.
+ # Anyway, we have to distinguish between Debug and Release redist files as well.
+ IF(MSVC)
+ STRING(REGEX REPLACE "\\\\" "\\\\\\\\" VC_INSTALL_PATH "$ENV{VCINSTALLDIR}")
+ SET(VC_RUNTIME_REDIST_FILES "File '${VC_INSTALL_PATH}\\\\redist\\\\Debug_NonRedist\\\\x86\\\\Microsoft.VC90.DebugCRT\\\\*.*'")
+ ENDIF(MSVC)
+
+ SET(CPACK_SET_DESTDIR "OFF")
+ SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.iolanguage.com")
+ SET(CPACK_NSIS_HELP_LINK "http://www.iolanguage.com")
+ SET(CPACK_NSIS_MODIFY_PATH "ON")
+ SET(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "
+ WriteIniStr '\$INSTDIR\\\\IoLanguageWebSite.url' 'InternetShortcut' 'URL' '${CPACK_NSIS_URL_INFO_ABOUT}'
+ SetOutPath '\$INSTDIR\\\\lib'
+ SetOverwrite try
+ ${VC_RUNTIME_REDIST_FILES}
+ ")
+ SET(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "
+ Delete '\$INSTDIR\\\\IoLanguageWebSite.url'
+ Delete '\$INSTDIR\\\\lib\\\\*.*'
+ ")
+
+ SET(CPACK_NSIS_CREATE_ICONS "
+ CreateShortCut '\$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\Io CLI.lnk' '$INSTDIR\\\\bin\\\\io.exe'
+ CreateShortCut '\$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\IoLanguage Web Site.lnk' '\$INSTDIR\\\\IoLanguageWebSite.url'
+ ")
+ SET(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '\$DESKTOP\\\\Io CLI.lnk' '$INSTDIR\\\\bin\\\\io.exe'")
+ SET(CPACK_NSIS_DELETE_ICONS "
+ Delete '\$SMPROGRAMS\\\\$MUI_TEMP\\\\Io CLI.lnk'
+ Delete '\$SMPROGRAMS\\\\$MUI_TEMP\\\\IoLanguage Web Site.lnk'
+ ")
+ SET(CPACK_NSIS_DELETE_ICONS_EXTRA "Delete '\$DESKTOP\\\\Io CLI.lnk'")
+ENDIF(WIN32)
+
+IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ SET(CPACK_SET_DESTDIR "ON")
+
+ FIND_PROGRAM(DPKG_CMD dpkg)
+ IF(DPKG_CMD)
+ SET(CPACK_GENERATOR ${CPACK_GENERATOR} DEB)
+ ELSE(DPKG_CMD)
+ MESSAGE( STATUS "dpkg binary not found, not building debian package" )
+ ENDIF(DPKG_CMD)
+
+ FIND_PROGRAM(RPMBUILD_CMD rpmbuild)
+ IF(RPMBUILD_CMD)
+ SET( CPACK_GENERATOR ${CPACK_GENERATOR} RPM )
+ ELSE(RPMBUILD_CMD)
+ MESSAGE( STATUS "rpmbuild binary not found, not building rpm package" )
+ ENDIF(RPMBUILD_CMD)
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+
+include(CPack)
+
View
4 addons/AVCodec/CMakeLists.txt
@@ -41,6 +41,6 @@ if(FFMPEG_FOUND AND FFMPEG_SWSCALE_FOUND)
target_link_libraries(IoAVCodec iovmall ${FFMPEG_LIBRARIES} ${FFMPEG_SWS_LIBRARIES})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/AVCodec)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/AVCodec)
endif(FFMPEG_FOUND AND FFMPEG_SWSCALE_FOUND)
View
4 addons/AsyncRequest/CMakeLists.txt
@@ -35,6 +35,6 @@ if(ASYNCREQUEST_FOUND)
target_link_libraries(IoAsyncRequest iovmall ${LINK_RT_LIB})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/AsyncRequest)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/AsyncRequest)
endif(ASYNCREQUEST_FOUND)
View
4 addons/BigNum/CMakeLists.txt
@@ -35,6 +35,6 @@ if(GMP_FOUND)
target_link_libraries(IoBigNum iovmall ${GMP_LIBRARIES})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/BigNum)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/BigNum)
endif(GMP_FOUND)
View
4 addons/Bitly/CMakeLists.txt
@@ -23,5 +23,5 @@ add_dependencies(IoBitly iovmall)
target_link_libraries(IoBitly iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Bitly)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Bitly)
View
4 addons/Blowfish/CMakeLists.txt
@@ -27,5 +27,5 @@ add_dependencies(IoBlowfish iovmall)
target_link_libraries(IoBlowfish iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Blowfish)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Blowfish)
View
4 addons/Box/CMakeLists.txt
@@ -28,5 +28,5 @@ add_dependencies(IoBox iovmall)
target_link_libraries(IoBox iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Box)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Box)
View
4 addons/CFFI/CMakeLists.txt
@@ -48,6 +48,6 @@ if(FFI_FOUND)
target_link_libraries(IoCFFI iovmall ${FFI_LIBRARIES})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/CFFI)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/CFFI)
endif(FFI_FOUND)
View
4 addons/CGI/CMakeLists.txt
@@ -23,5 +23,5 @@ add_dependencies(IoCGI iovmall)
target_link_libraries(IoCGI iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/CGI)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/CGI)
View
4 addons/Cairo/CMakeLists.txt
@@ -63,6 +63,6 @@ if(CAIRO_FOUND)
target_link_libraries(IoCairo iovmall ${CAIRO_LIBRARIES})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Cairo)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Cairo)
endif(CAIRO_FOUND)
View
4 addons/Clutter/CMakeLists.txt
@@ -58,6 +58,6 @@ if(CLUTTER_FOUND AND ATK_FOUND AND GLIB2_FOUND AND Pango_1_0_FOUND AND CAIRO_FOU
${CAIRO_LIBRARIES})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Clutter)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Clutter)
endif(CLUTTER_FOUND AND ATK_FOUND AND GLIB2_FOUND AND Pango_1_0_FOUND AND CAIRO_FOUND)
View
4 addons/ContinuedFraction/CMakeLists.txt
@@ -23,5 +23,5 @@ add_dependencies(IoContinuedFraction iovmall)
target_link_libraries(IoContinuedFraction iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/ContinuedFraction)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/ContinuedFraction)
View
4 addons/Curses/CMakeLists.txt
@@ -35,6 +35,6 @@ if(CURSES_FOUND)
target_link_libraries(IoCurses iovmall ${CURSES_LIBRARY})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Curses)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Curses)
endif(CURSES_FOUND)
View
4 addons/DBI/CMakeLists.txt
@@ -37,6 +37,6 @@ if(DBI_FOUND)
target_link_libraries(IoDBI iovmall ${DBI_LIBRARY})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/DBI)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/DBI)
endif(DBI_FOUND)
View
4 addons/DistributedObjects/CMakeLists.txt
@@ -23,5 +23,5 @@ add_dependencies(IoDistributedObjects iovmall)
target_link_libraries(IoDistributedObjects iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/DistributedObjects)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/DistributedObjects)
View
4 addons/EditLine/CMakeLists.txt
@@ -35,6 +35,6 @@ if(EDIT_FOUND)
target_link_libraries(IoEditLine iovmall ${EDIT_LIBRARY})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/EditLine)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/EditLine)
endif(EDIT_FOUND)
View
4 addons/Facebook/CMakeLists.txt
@@ -22,5 +22,5 @@ add_dependencies(IoFacebook iovmall)
target_link_libraries(IoFacebook iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Facebook)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Facebook)
View
4 addons/Flux/CMakeLists.txt
@@ -23,5 +23,5 @@ add_dependencies(IoFlux iovmall)
target_link_libraries(IoFlux iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Flux)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Flux)
View
4 addons/Fnmatch/CMakeLists.txt
@@ -30,6 +30,6 @@ if(FNMATCH_FOUND)
target_link_libraries(IoFnmatch iovmall)
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Fnmatch)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Fnmatch)
endif(FNMATCH_FOUND)
View
4 addons/Font/CMakeLists.txt
@@ -42,6 +42,6 @@ if(OPENGL_FOUND AND GLUT_FOUND AND FREETYPE_FOUND AND ((GLUT_Xmu_LIBRARY AND GLU
target_link_libraries(IoFont iovmall ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES} ${FREETYPE_LIBRARIES})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Font)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Font)
endif(OPENGL_FOUND AND GLUT_FOUND AND FREETYPE_FOUND AND ((GLUT_Xmu_LIBRARY AND GLUT_Xi_LIBRARY) OR NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux"))
View
4 addons/GLFW/CMakeLists.txt
@@ -44,6 +44,6 @@ if(GLFW_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND AND GLUT_FOUND)
target_link_libraries(IoGLFW iovmall ${GLFW_LIBRARY} ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/GLFW)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/GLFW)
endif(GLFW_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND AND GLUT_FOUND)
View
4 addons/GoogleSearch/CMakeLists.txt
@@ -23,5 +23,5 @@ add_dependencies(IoGoogleSearch iovmall)
target_link_libraries(IoGoogleSearch iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/GoogleSearch)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/GoogleSearch)
View
4 addons/HttpClient/CMakeLists.txt
@@ -23,5 +23,5 @@ add_dependencies(IoHttpClient iovmall)
target_link_libraries(IoHttpClient iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/HttpClient)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/HttpClient)
View
4 addons/Image/CMakeLists.txt
@@ -45,6 +45,6 @@ if(PNG_FOUND AND TIFF_FOUND AND JPEG_FOUND)
target_link_libraries(IoImage iovmall ${PNG_LIBRARIES} ${TIFF_LIBRARIES} ${JPEG_LIBRARIES})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Image)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Image)
endif(PNG_FOUND AND TIFF_FOUND AND JPEG_FOUND)
View
4 addons/LZO/CMakeLists.txt
@@ -46,5 +46,5 @@ else()
endif(LZO_FOUND)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/LZO)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/LZO)
View
4 addons/LibSndFile/CMakeLists.txt
@@ -35,6 +35,6 @@ if(LIBSNDFILE_FOUND)
target_link_libraries(IoLibSndFile iovmall ${LIBSNDFILE_LIBRARY})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/LibSndFile)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/LibSndFile)
endif(LIBSNDFILE_FOUND)
View
4 addons/Libxml2/CMakeLists.txt
@@ -41,6 +41,6 @@ if(LIBXML2_FOUND AND ICONV_FOUND)
target_link_libraries(IoLibxml2 iovmall ${LIBXML2_LIBRARIES} ${ICONV_LIBRARIES})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Libxml2)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Libxml2)
endif(LIBXML2_FOUND AND ICONV_FOUND)
View
4 addons/Loki/CMakeLists.txt
@@ -26,5 +26,5 @@ add_dependencies(IoLoki iovmall)
target_link_libraries(IoLoki iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Loki)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Loki)
View
4 addons/Loudmouth/CMakeLists.txt
@@ -37,6 +37,6 @@ if(LOUDMOUTH_FOUND)
target_link_libraries(IoLoudmouth iovmall ${LOUDMOUTH_LIBRARY})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Loudmouth)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Loudmouth)
endif(LOUDMOUTH_FOUND)
View
4 addons/MD5/CMakeLists.txt
@@ -27,5 +27,5 @@ add_dependencies(IoMD5 iovmall)
target_link_libraries(IoMD5 iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/MD5)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/MD5)
View
4 addons/Memcached/CMakeLists.txt
@@ -35,6 +35,6 @@ if(LIBMEMCACHED_FOUND)
target_link_libraries(IoMemcached iovmall ${LIBMEMCACHED_LIBRARY})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Memcached)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Memcached)
endif(LIBMEMCACHED_FOUND)
View
4 addons/MySQL/CMakeLists.txt
@@ -35,6 +35,6 @@ if(MYSQL_FOUND)
target_link_libraries(IoMySQL iovmall ${MYSQL_LIBRARY})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/MySQL)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/MySQL)
endif(MYSQL_FOUND)
View
4 addons/NotificationCenter/CMakeLists.txt
@@ -23,5 +23,5 @@ add_dependencies(IoNotificationCenter iovmall)
target_link_libraries(IoNotificationCenter iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/NotificationCenter)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/NotificationCenter)
View
4 addons/ODE/CMakeLists.txt
@@ -57,6 +57,6 @@ if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND GLUT_FOUND)
target_link_libraries(IoODE iovmall ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/ODE)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/ODE)
endif(OPENGL_FOUND AND OPENGL_GLU_FOUND AND GLUT_FOUND)
View
6 addons/Oauth/CMakeLists.txt
@@ -39,7 +39,7 @@ if(OPENSSL_FOUND)
target_link_libraries(IoOauth iovmall ${OPENSSL_LIBRARIES})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Oauth)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Oauth)
-endif(OPENSSL_FOUND)
+endif(OPENSSL_FOUND)
View
4 addons/Obsidian/CMakeLists.txt
@@ -23,5 +23,5 @@ add_dependencies(IoObsidian iovmall)
target_link_libraries(IoObsidian iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Obsidian)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Obsidian)
View
4 addons/Ogg/CMakeLists.txt
@@ -38,6 +38,6 @@ if(OGG_FOUND)
target_link_libraries(IoOgg iovmall ${OGG_LIBRARY})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Ogg)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Ogg)
endif(OGG_FOUND)
View
4 addons/OpenGL/CMakeLists.txt
@@ -47,6 +47,6 @@ if(OPENGL_FOUND AND OPENGL_GLU_FOUND AND GLUT_FOUND AND ((GLUT_Xmu_LIBRARY AND G
target_link_libraries(IoOpenGL iovmall IoBox ${OPENGL_LIBRARIES} ${GLUT_LIBRARIES})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/OpenGL)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/OpenGL)
endif(OPENGL_FOUND AND OPENGL_GLU_FOUND AND GLUT_FOUND AND ((GLUT_Xmu_LIBRARY AND GLUT_Xi_LIBRARY) OR NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux"))
View
4 addons/PostgreSQL/CMakeLists.txt
@@ -23,5 +23,5 @@ add_dependencies(IoPostgreSQL iovmall)
target_link_libraries(IoPostgreSQL iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/PostgreSQL)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/PostgreSQL)
View
4 addons/Python/CMakeLists.txt
@@ -58,6 +58,6 @@ if(PYTHONLIBS_FOUND)
target_link_libraries(IoPython iovmall ${PYTHON_LIBRARIES})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Python)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Python)
endif(PYTHONLIBS_FOUND)
View
4 addons/QDBM/CMakeLists.txt
@@ -35,6 +35,6 @@ if(QDBM_FOUND)
target_link_libraries(IoQDBM iovmall ${QDBM_LIBRARY})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/QDBM)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/QDBM)
endif(QDBM_FOUND)
View
4 addons/Random/CMakeLists.txt
@@ -26,5 +26,5 @@ add_dependencies(IoRandom iovmall)
target_link_libraries(IoRandom iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Random)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Random)
View
4 addons/Range/CMakeLists.txt
@@ -28,5 +28,5 @@ add_dependencies(IoRange iovmall)
target_link_libraries(IoRange iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Range)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Range)
View
4 addons/Rational/CMakeLists.txt
@@ -23,5 +23,5 @@ add_dependencies(IoRational iovmall)
target_link_libraries(IoRational iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Rational)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Rational)
View
4 addons/ReadLine/CMakeLists.txt
@@ -35,6 +35,6 @@ if(READLINE_FOUND)
target_link_libraries(IoReadLine iovmall ${READLINE_LIBRARY})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/ReadLine)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/ReadLine)
endif(READLINE_FOUND)
View
4 addons/Regex/CMakeLists.txt
@@ -38,6 +38,6 @@ if(PCRE_FOUND)
target_link_libraries(IoRegex iovmall ${PCRE_LIBRARIES} IoRange)
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Regex)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Regex)
endif(PCRE_FOUND)
View
4 addons/SGML/CMakeLists.txt
@@ -33,5 +33,5 @@ add_dependencies(IoSGML iovmall sgml)
target_link_libraries(IoSGML iovmall sgml)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/SGML)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/SGML)
View
4 addons/SHA1/CMakeLists.txt
@@ -28,5 +28,5 @@ add_dependencies(IoSHA1 iovmall)
target_link_libraries(IoSHA1 iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/SHA1)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/SHA1)
View
4 addons/SQLite3/CMakeLists.txt
@@ -36,6 +36,6 @@ if(SQLITE_FOUND)
target_link_libraries(IoSQLite3 iovmall ${SQLITE_LIBRARIES})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/SQLite3)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/SQLite3)
endif(SQLITE_FOUND)
View
4 addons/SampleRateConverter/CMakeLists.txt
@@ -35,6 +35,6 @@ if(SAMPLERATE_FOUND)
target_link_libraries(IoSampleRateConverter iovmall ${SAMPLERATE_LIBRARY})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/SampleRateConverter)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/SampleRateConverter)
endif(SAMPLERATE_FOUND)
View
4 addons/SecureSocket/CMakeLists.txt
@@ -40,6 +40,6 @@ if(SSL_FOUND)
target_link_libraries(IoSecureSocket iovmall ${SSL_LIBRARY} IoSocket)
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/SecureSocket)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/SecureSocket)
endif(SSL_FOUND)
View
4 addons/Socket/CMakeLists.txt
@@ -63,6 +63,6 @@ if(EVENT_FOUND)
target_link_libraries(IoSocket iovmall ${EVENT_LIBRARY} ${LIBS})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Socket)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Socket)
endif(EVENT_FOUND)
View
12 addons/Socket/io/A1_Socket.io
@@ -261,8 +261,8 @@ Socket do(
)
- /*doc Socket udpReadNextChunk(ipAddress)
- Waits to receive UDP data from the specified ipAddress.
+ /*doc Socket udpReadNextChunk(address)
+ Waits to receive UDP data from the specified address (IPAddress or UnixPath).
As soon as any data is available, it reads all of it into the socket's readBuffer.
Returns self on success or an Error object on error.
*/
@@ -279,11 +279,11 @@ Socket do(
self
)
- /*doc Socket udpRead(ipAddress, numBytes)
- Waits for and reads numBytes of udp data from the specified ipAddress into the socket's readBuffer.
+ /*doc Socket udpRead(address, numBytes)
+ Waits for and reads numBytes of udp data from the specified address (IPAddress or UnixPath) into the socket's readBuffer.
Returns self on success or an Error object on error.
*/
- udpRead := method(ipAddress, numBytes,
+ udpRead := method(address, numBytes,
total := readBuffer size + numBytes
while(readBuffer size < total,
@@ -296,7 +296,7 @@ Socket do(
udpWrite := getSlot("asyncUdpWrite")
/*doc Socket serverOpen
- Opens the socket as a stream, binds it to its ipAddress and calls asyncListen to prepare the socket to accept connections.
+ Opens the socket as a stream, binds it to its address and calls asyncListen to prepare the socket to accept connections.
Returns self on success or an Error object on error.
*/
serverOpen := method(
View
3  addons/Socket/io/A2_Server.io
@@ -45,6 +45,9 @@ with kernel threads and socket polling.
//doc Server port Returns the port on which the server will listen for connections.
port := method(socket port)
+ //doc Server setPath(path) Sets the path (for Unix Domain sockets) on which the server will listen for connections. Returns self.
+ setPath := method(port, socket setPath(path); self)
+
/*doc Server start
Starts the server. This method will not return until server is stopped,
so you may want to send the start message as an asynchronous message.
View
4 addons/SqlDatabase/CMakeLists.txt
@@ -23,5 +23,5 @@ add_dependencies(IoSqlDatabase iovmall)
target_link_libraries(IoSqlDatabase iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/SqlDatabase)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/SqlDatabase)
View
4 addons/Syslog/CMakeLists.txt
@@ -30,6 +30,6 @@ if(SYSLOG_FOUND)
target_link_libraries(IoSyslog iovmall)
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Syslog)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Syslog)
endif(SYSLOG_FOUND)
View
4 addons/SystemCall/CMakeLists.txt
@@ -27,5 +27,5 @@ add_dependencies(IoSystemCall iovmall)
target_link_libraries(IoSystemCall iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/SystemCall)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/SystemCall)
View
4 addons/TagLib/CMakeLists.txt
@@ -35,6 +35,6 @@ if(TAGLIB_FOUND)
target_link_libraries(IoTagLib iovmall ${TAGLIB_LIBRARY})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/TagLib)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/TagLib)
endif(TAGLIB_FOUND)
View
4 addons/Theora/CMakeLists.txt
@@ -41,6 +41,6 @@ if(THEORA_FOUND)
target_link_libraries(IoTheora iovmall ${THEORA_LIBRARY} IoOgg)
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Theora)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Theora)
endif(THEORA_FOUND)
View
4 addons/Thread/CMakeLists.txt
@@ -34,6 +34,6 @@ if(CMAKE_USE_PTHREADS_INIT)
target_link_libraries(IoThread iovmall ${CMAKE_THREAD_LIBS_INIT} pthread)
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Thread)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Thread)
endif(CMAKE_USE_PTHREADS_INIT)
View
4 addons/TokyoCabinet/CMakeLists.txt
@@ -37,6 +37,6 @@ if(TOKYOCABINET_FOUND)
target_link_libraries(IoTokyoCabinet iovmall ${TOKYOCABINET_LIBRARY})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/TokyoCabinet)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/TokyoCabinet)
endif(TOKYOCABINET_FOUND)
View
4 addons/Twitter/CMakeLists.txt
@@ -23,5 +23,5 @@ add_dependencies(IoTwitter iovmall)
target_link_libraries(IoTwitter iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Twitter)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Twitter)
View
4 addons/UUID/CMakeLists.txt
@@ -35,6 +35,6 @@ if(UUID_FOUND)
target_link_libraries(IoUUID iovmall)
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/UUID)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/UUID)
endif(UUID_FOUND)
View
4 addons/User/CMakeLists.txt
@@ -26,5 +26,5 @@ add_dependencies(IoUser iovmall)
target_link_libraries(IoUser iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/User)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/User)
View
4 addons/VertexDB/CMakeLists.txt
@@ -23,5 +23,5 @@ add_dependencies(IoVertexDB iovmall)
target_link_libraries(IoVertexDB iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/VertexDB)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/VertexDB)
View
4 addons/Volcano/CMakeLists.txt
@@ -28,5 +28,5 @@ add_dependencies(IoVolcano iovmall)
target_link_libraries(IoVolcano iovmall)
# Install the addon to our global addons hierarchy.
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
-install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Volcano)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Volcano)
View
4 addons/Vorbis/CMakeLists.txt
@@ -41,6 +41,6 @@ if(VORBIS_FOUND)
target_link_libraries(IoVorbis iovmall ${VORBIS_LIBRARY} IoOgg)
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Vorbis)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Vorbis)
endif(VORBIS_FOUND)
View
4 addons/Yajl/CMakeLists.txt
@@ -36,6 +36,6 @@ if(YAJL_FOUND)
target_link_libraries(IoYajl iovmall ${YAJL_LIBRARY})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Yajl)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Yajl)
endif(YAJL_FOUND)
View
4 addons/Zlib/CMakeLists.txt
@@ -36,6 +36,6 @@ if(ZLIB_FOUND)
target_link_libraries(IoZlib iovmall ${ZLIB_LIBRARY})
# Install the addon to our global addons hierarchy.
- install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons)
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/io/addons/Zlib)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION lib/io/addons)
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/_build DESTINATION lib/io/addons/Zlib)
endif(ZLIB_FOUND)
View
2  libs/basekit/CMakeLists.txt
@@ -23,4 +23,4 @@ add_library(basekit SHARED ${SRCS})
# The following add the install target, so we put libbasekit.* in our
# install prefix.
-install(TARGETS basekit DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+install(TARGETS basekit DESTINATION lib)
View
2  libs/coroutine/CMakeLists.txt
@@ -32,4 +32,4 @@ add_library(coroutine SHARED ${SRCS})
# The following add the install target, so we put libcoroutine.* in
# our install prefix.
-install(TARGETS coroutine DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+install(TARGETS coroutine DESTINATION lib)
View
2  libs/garbagecollector/CMakeLists.txt
@@ -25,4 +25,4 @@ target_link_libraries(garbagecollector basekit)
# The following add the install target, so we put libgarbagecollector.*
# in our install prefix.
-install(TARGETS garbagecollector DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+install(TARGETS garbagecollector DESTINATION lib)
View
2  libs/iovm/CMakeLists.txt
@@ -88,4 +88,4 @@ target_link_libraries(iovmall basekit coroutine garbagecollector)
# The following add the install target, so we put libvmall.* in our
# install prefix.
-install(TARGETS iovmall DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+install(TARGETS iovmall DESTINATION lib)
View
7 libs/iovm/source/IoDirectory.c
@@ -343,6 +343,7 @@ IO_METHOD(IoDirectory, exists)
path = IoMessage_locals_symbolArgAt_(m, locals, 0);
}
+#if !defined(_WIN32) || defined(__CYGWIN__)
dirp = opendir(CSTRING(path));
if (!dirp)
@@ -352,6 +353,12 @@ IO_METHOD(IoDirectory, exists)
(void)closedir(dirp);
return IOTRUE(self);
+#else
+ {
+ DWORD d = GetFileAttributes(CSTRING(path));
+ return (d != INVALID_FILE_ATTRIBUTES) && (d & FILE_ATTRIBUTE_DIRECTORY) ? IOTRUE(self) : IOFALSE(self);
+ }
+#endif
}
IO_METHOD(IoDirectory, items)
View
8 libs/iovm/source/IoSystem.c
@@ -270,11 +270,15 @@ IO_METHOD(IoObject, system)
char *buf = NULL;
int result = 0;
buf = (char *)getcwd(buf, 1024);
-
+
//printf("CURDIR: [%s]\n", buf);
//printf("SYSTEM: [%s]\n", CSTRING(s));
- result = system(CSTRING(s))/ 256;
+ result = system(CSTRING(s));
//printf("system result = %i\n", result);
+#if !defined(_WIN32) || defined(__CYGWIN__)
+ result /= 256;
+#endif
+
return IONUMBER(result);
}
View
972 modules/NSIS.template.in
@@ -0,0 +1,972 @@
+; CPack install script designed for a nmake build
+
+;--------------------------------
+; You must define these values
+
+ !define VERSION "@CPACK_PACKAGE_VERSION@"
+ !define PATCH "@CPACK_PACKAGE_VERSION_PATCH@"
+ !define INST_DIR "@CPACK_TEMPORARY_DIRECTORY@"
+
+;--------------------------------
+;Variables
+
+ Var MUI_TEMP
+ Var STARTMENU_FOLDER
+ Var SV_ALLUSERS
+ Var START_MENU
+ Var DO_NOT_ADD_TO_PATH
+ Var ADD_TO_PATH_ALL_USERS
+ Var ADD_TO_PATH_CURRENT_USER
+ Var INSTALL_DESKTOP
+ Var IS_DEFAULT_INSTALLDIR
+;--------------------------------
+;Include Modern UI
+
+ !include "MUI.nsh"
+
+ ;Default installation folder
+ InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
+
+;--------------------------------
+;General
+
+ ;Name and file
+ Name "@CPACK_NSIS_PACKAGE_NAME@"
+ OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
+
+ ;Set compression
+ SetCompressor @CPACK_NSIS_COMPRESSOR@
+
+@CPACK_NSIS_DEFINES@
+
+ !include Sections.nsh
+
+;--- Component support macros: ---
+; The code for the add/remove functionality is from:
+; http://nsis.sourceforge.net/Add/Remove_Functionality
+; It has been modified slightly and extended to provide
+; inter-component dependencies.
+Var AR_SecFlags
+Var AR_RegFlags
+@CPACK_NSIS_SECTION_SELECTED_VARS@
+
+; Loads the "selected" flag for the section named SecName into the
+; variable VarName.
+!macro LoadSectionSelectedIntoVar SecName VarName
+ SectionGetFlags ${${SecName}} $${VarName}
+ IntOp $${VarName} $${VarName} & ${SF_SELECTED} ;Turn off all other bits
+!macroend
+
+; Loads the value of a variable... can we get around this?
+!macro LoadVar VarName
+ IntOp $R0 0 + $${VarName}
+!macroend
+
+; Sets the value of a variable
+!macro StoreVar VarName IntValue
+ IntOp $${VarName} 0 + ${IntValue}
+!macroend
+
+!macro InitSection SecName
+ ; This macro reads component installed flag from the registry and
+ ;changes checked state of the section on the components page.
+ ;Input: section index constant name specified in Section command.
+
+ ClearErrors
+ ;Reading component status from registry
+ ReadRegDWORD $AR_RegFlags HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}" "Installed"
+ IfErrors "default_${SecName}"
+ ;Status will stay default if registry value not found
+ ;(component was never installed)
+ IntOp $AR_RegFlags $AR_RegFlags & ${SF_SELECTED} ;Turn off all other bits
+ SectionGetFlags ${${SecName}} $AR_SecFlags ;Reading default section flags
+ IntOp $AR_SecFlags $AR_SecFlags & 0xFFFE ;Turn lowest (enabled) bit off
+ IntOp $AR_SecFlags $AR_RegFlags | $AR_SecFlags ;Change lowest bit
+
+ ; Note whether this component was installed before
+ !insertmacro StoreVar ${SecName}_was_installed $AR_RegFlags
+ IntOp $R0 $AR_RegFlags & $AR_RegFlags
+
+ ;Writing modified flags
+ SectionSetFlags ${${SecName}} $AR_SecFlags
+
+ "default_${SecName}:"
+ !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected
+!macroend
+
+!macro FinishSection SecName
+ ; This macro reads section flag set by user and removes the section
+ ;if it is not selected.
+ ;Then it writes component installed flag to registry
+ ;Input: section index constant name specified in Section command.
+
+ SectionGetFlags ${${SecName}} $AR_SecFlags ;Reading section flags
+ ;Checking lowest bit:
+ IntOp $AR_SecFlags $AR_SecFlags & ${SF_SELECTED}
+ IntCmp $AR_SecFlags 1 "leave_${SecName}"
+ ;Section is not selected:
+ ;Calling Section uninstall macro and writing zero installed flag
+ !insertmacro "Remove_${${SecName}}"
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}" \
+ "Installed" 0
+ Goto "exit_${SecName}"
+
+ "leave_${SecName}:"
+ ;Section is selected:
+ WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@\Components\${SecName}" \
+ "Installed" 1
+
+ "exit_${SecName}:"
+!macroend
+
+!macro RemoveSection SecName
+ ; This macro is used to call section's Remove_... macro
+ ;from the uninstaller.
+ ;Input: section index constant name specified in Section command.
+
+ !insertmacro "Remove_${${SecName}}"
+!macroend
+
+; Determine whether the selection of SecName changed
+!macro MaybeSelectionChanged SecName
+ !insertmacro LoadVar ${SecName}_selected
+ SectionGetFlags ${${SecName}} $R1
+ IntOp $R1 $R1 & ${SF_SELECTED} ;Turn off all other bits
+
+ ; See if the status has changed:
+ IntCmp $R0 $R1 "${SecName}_unchanged"
+ !insertmacro LoadSectionSelectedIntoVar ${SecName} ${SecName}_selected
+
+ IntCmp $R1 ${SF_SELECTED} "${SecName}_was_selected"
+ !insertmacro "Deselect_required_by_${SecName}"
+ goto "${SecName}_unchanged"
+
+ "${SecName}_was_selected:"
+ !insertmacro "Select_${SecName}_depends"
+
+ "${SecName}_unchanged:"
+!macroend
+;--- End of Add/Remove macros ---
+
+;--------------------------------
+;Interface Settings
+
+ !define MUI_HEADERIMAGE
+ !define MUI_ABORTWARNING
+
+;--------------------------------
+; path functions
+
+!verbose 3
+!include "WinMessages.NSH"
+!verbose 4
+
+;----------------------------------------
+; based upon a script of "Written by KiCHiK 2003-01-18 05:57:02"
+;----------------------------------------
+!verbose 3
+!include "WinMessages.NSH"
+!verbose 4
+;====================================================
+; get_NT_environment
+; Returns: the selected environment
+; Output : head of the stack
+;====================================================
+!macro select_NT_profile UN
+Function ${UN}select_NT_profile
+ StrCmp $ADD_TO_PATH_ALL_USERS "1" 0 environment_single
+ DetailPrint "Selected environment for all users"
+ Push "all"
+ Return
+ environment_single:
+ DetailPrint "Selected environment for current user only."
+ Push "current"
+ Return
+FunctionEnd
+!macroend
+!insertmacro select_NT_profile ""
+!insertmacro select_NT_profile "un."
+;----------------------------------------------------
+!define NT_current_env 'HKCU "Environment"'
+!define NT_all_env 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
+
+!ifndef WriteEnvStr_RegKey
+ !ifdef ALL_USERS
+ !define WriteEnvStr_RegKey \
+ 'HKLM "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"'
+ !else
+ !define WriteEnvStr_RegKey 'HKCU "Environment"'
+ !endif
+!endif
+
+; GetPathEnvVar - Retrieves the correct (User or All) PATH environment variable
+; Input: None
+; Output: User or All path environment variable
+
+Function GetPathEnvVar
+ Push $0
+ StrCmp $ADD_TO_PATH_ALL_USERS "1" ReadAllKey
+ ReadRegStr $0 ${NT_current_env} "PATH"
+ Goto Current
+ ReadAllKey:
+ ReadRegStr $0 ${NT_all_env} "PATH"
+ Current:
+ Exch $0
+FunctionEnd
+
+; AddToPath - Adds the given dir to the search path.
+; Input - head of the stack
+; Note - Win9x systems requires reboot
+
+Function AddToPath
+ Exch $0
+ Push $1
+ Push $2
+ Push $3
+ Push $4
+
+ # don't add if the path doesn't exist
+ IfFileExists "$0\*.*" "" AddToPath_done
+
+ Call GetPathEnvVar
+ Pop $4
+ Push $4
+ Pop $1
+
+ ; ReadEnvStr $1 PATH
+ ; if the path is too long for a NSIS variable NSIS will return a 0
+ ; length string. If we find that, then warn and skip any path
+ ; modification as it will trash the existing path.
+ StrLen $2 $1
+ IntCmp $2 0 CheckPathLength_ShowPathWarning CheckPathLength_Done CheckPathLength_Done
+ CheckPathLength_ShowPathWarning:
+ Messagebox MB_OK|MB_ICONEXCLAMATION "Warning! PATH too long installer unable to modify PATH!"
+ Goto AddToPath_done
+ CheckPathLength_Done:
+ Push "$1;"
+ Push "$0;"
+ Call StrStr
+ Pop $2
+ StrCmp $2 "" "" AddToPath_done
+ Push "$1;"
+ Push "$0\;"
+ Call StrStr
+ Pop $2
+ StrCmp $2 "" "" AddToPath_done
+ GetFullPathName /SHORT $3 $0
+ Push "$1;"
+ Push "$3;"
+ Call StrStr
+ Pop $2
+ StrCmp $2 "" "" AddToPath_done
+ Push "$1;"
+ Push "$3\;"
+ Call StrStr
+ Pop $2
+ StrCmp $2 "" "" AddToPath_done
+
+ Call IsNT
+ Pop $1
+ StrCmp $1 1 AddToPath_NT
+ ; Not on NT
+ StrCpy $1 $WINDIR 2
+ FileOpen $1 "$1\autoexec.bat" a
+ FileSeek $1 -1 END
+ FileReadByte $1 $2
+ IntCmp $2 26 0 +2 +2 # DOS EOF
+ FileSeek $1 -1 END # write over EOF
+ FileWrite $1 "$\r$\nSET PATH=%PATH%;$3$\r$\n"
+ FileClose $1
+ SetRebootFlag true
+ Goto AddToPath_done
+
+ AddToPath_NT:
+ StrCmp $4 "" AddToPath_NTdoIt
+ Push $4
+ Call Trim
+ Pop $4
+ StrCpy $0 "$4;$0"
+ AddToPath_NTdoIt:
+ StrCmp $ADD_TO_PATH_ALL_USERS "1" WriteAllKey
+ WriteRegExpandStr ${NT_current_env} "PATH" $0
+ Goto DoSend
+ WriteAllKey:
+ WriteRegExpandStr ${NT_all_env} "PATH" $0
+ DoSend:
+ SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
+
+ AddToPath_done:
+ Pop $4
+ Pop $3
+ Pop $2
+ Pop $1
+ Pop $0
+FunctionEnd
+
+
+; RemoveFromPath - Remove a given dir from the path
+; Input: head of the stack
+
+Function un.RemoveFromPath
+ Exch $0
+ Push $1
+ Push $2
+ Push $3
+ Push $4
+ Push $5
+ Push $6
+
+ IntFmt $6 "%c" 26 # DOS EOF
+
+ Call un.IsNT
+ Pop $1
+ StrCmp $1 1 unRemoveFromPath_NT
+ ; Not on NT
+ StrCpy $1 $WINDIR 2
+ FileOpen $1 "$1\autoexec.bat" r
+ GetTempFileName $4
+ FileOpen $2 $4 w
+ GetFullPathName /SHORT $0 $0
+ StrCpy $0 "SET PATH=%PATH%;$0"
+ Goto unRemoveFromPath_dosLoop
+
+ unRemoveFromPath_dosLoop:
+ FileRead $1 $3
+ StrCpy $5 $3 1 -1 # read last char
+ StrCmp $5 $6 0 +2 # if DOS EOF
+ StrCpy $3 $3 -1 # remove DOS EOF so we can compare
+ StrCmp $3 "$0$\r$\n" unRemoveFromPath_dosLoopRemoveLine
+ StrCmp $3 "$0$\n" unRemoveFromPath_dosLoopRemoveLine
+ StrCmp $3 "$0" unRemoveFromPath_dosLoopRemoveLine
+ StrCmp $3 "" unRemoveFromPath_dosLoopEnd
+ FileWrite $2 $3
+ Goto unRemoveFromPath_dosLoop
+ unRemoveFromPath_dosLoopRemoveLine:
+ SetRebootFlag true
+ Goto unRemoveFromPath_dosLoop
+
+ unRemoveFromPath_dosLoopEnd:
+ FileClose $2
+ FileClose $1
+ StrCpy $1 $WINDIR 2
+ Delete "$1\autoexec.bat"
+ CopyFiles /SILENT $4 "$1\autoexec.bat"
+ Delete $4
+ Goto unRemoveFromPath_done
+
+ unRemoveFromPath_NT:
+ StrCmp $ADD_TO_PATH_ALL_USERS "1" unReadAllKey
+ ReadRegStr $1 ${NT_current_env} "PATH"
+ Goto unDoTrim
+ unReadAllKey:
+ ReadRegStr $1 ${NT_all_env} "PATH"
+ unDoTrim:
+ StrCpy $5 $1 1 -1 # copy last char
+ StrCmp $5 ";" +2 # if last char != ;
+ StrCpy $1 "$1;" # append ;
+ Push $1
+ Push "$0;"
+ Call un.StrStr ; Find `$0;` in $1
+ Pop $2 ; pos of our dir
+ StrCmp $2 "" unRemoveFromPath_done
+ ; else, it is in path
+ # $0 - path to add
+ # $1 - path var
+ StrLen $3 "$0;"
+ StrLen $4 $2
+ StrCpy $5 $1 -$4 # $5 is now the part before the path to remove
+ StrCpy $6 $2 "" $3 # $6 is now the part after the path to remove
+ StrCpy $3 $5$6
+
+ StrCpy $5 $3 1 -1 # copy last char
+ StrCmp $5 ";" 0 +2 # if last char == ;
+ StrCpy $3 $3 -1 # remove last char
+
+ StrCmp $ADD_TO_PATH_ALL_USERS "1" unWriteAllKey
+ WriteRegExpandStr ${NT_current_env} "PATH" $3
+ Goto unDoSend
+ unWriteAllKey:
+ WriteRegExpandStr ${NT_all_env} "PATH" $3
+ unDoSend:
+ SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
+
+ unRemoveFromPath_done:
+ Pop $6
+ Pop $5
+ Pop $4
+ Pop $3
+ Pop $2
+ Pop $1
+ Pop $0
+FunctionEnd
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Uninstall sutff
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+###########################################
+# Utility Functions #
+###########################################
+
+;====================================================
+; IsNT - Returns 1 if the current system is NT, 0
+; otherwise.
+; Output: head of the stack
+;====================================================
+; IsNT
+; no input
+; output, top of the stack = 1 if NT or 0 if not
+;
+; Usage:
+; Call IsNT
+; Pop $R0
+; ($R0 at this point is 1 or 0)
+
+!macro IsNT un
+Function ${un}IsNT
+ Push $0
+ ReadRegStr $0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" CurrentVersion
+ StrCmp $0 "" 0 IsNT_yes
+ ; we are not NT.
+ Pop $0
+ Push 0
+ Return
+
+ IsNT_yes:
+ ; NT!!!
+ Pop $0
+ Push 1
+FunctionEnd
+!macroend
+!insertmacro IsNT ""
+!insertmacro IsNT "un."
+
+; StrStr
+; input, top of stack = string to search for
+; top of stack-1 = string to search in
+; output, top of stack (replaces with the portion of the string remaining)
+; modifies no other variables.
+;
+; Usage:
+; Push "this is a long ass string"
+; Push "ass"
+; Call StrStr
+; Pop $R0
+; ($R0 at this point is "ass string")
+
+!macro StrStr un
+Function ${un}StrStr
+Exch $R1 ; st=haystack,old$R1, $R1=needle
+ Exch ; st=old$R1,haystack
+ Exch $R2 ; st=old$R1,old$R2, $R2=haystack
+ Push $R3
+ Push $R4
+ Push $R5
+ StrLen $R3 $R1
+ StrCpy $R4 0
+ ; $R1=needle
+ ; $R2=haystack
+ ; $R3=len(needle)
+ ; $R4=cnt
+ ; $R5=tmp
+ loop:
+ StrCpy $R5 $R2 $R3 $R4
+ StrCmp $R5 $R1 done
+ StrCmp $R5 "" done
+ IntOp $R4 $R4 + 1
+ Goto loop
+done:
+ StrCpy $R1 $R2 "" $R4
+ Pop $R5
+ Pop $R4
+ Pop $R3
+ Pop $R2
+ Exch $R1
+FunctionEnd
+!macroend
+!insertmacro StrStr ""
+!insertmacro StrStr "un."
+
+Function Trim ; Added by Pelaca
+ Exch $R1
+ Push $R2
+Loop:
+ StrCpy $R2 "$R1" 1 -1
+ StrCmp "$R2" " " RTrim
+ StrCmp "$R2" "$\n" RTrim
+ StrCmp "$R2" "$\r" RTrim
+ StrCmp "$R2" ";" RTrim
+ GoTo Done
+RTrim:
+ StrCpy $R1 "$R1" -1
+ Goto Loop
+Done:
+ Pop $R2
+ Exch $R1
+FunctionEnd
+
+Function ConditionalAddToRegisty
+ Pop $0
+ Pop $1
+ StrCmp "$0" "" ConditionalAddToRegisty_EmptyString
+ WriteRegStr SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" \
+ "$1" "$0"
+ ;MessageBox MB_OK "Set Registry: '$1' to '$0'"
+ DetailPrint "Set install registry entry: '$1' to '$0'"
+ ConditionalAddToRegisty_EmptyString:
+FunctionEnd
+
+;--------------------------------
+
+!ifdef CPACK_USES_DOWNLOAD
+Function DownloadFile
+ IfFileExists $INSTDIR\* +2
+ CreateDirectory $INSTDIR
+ Pop $0
+
+ ; Skip if already downloaded
+ IfFileExists $INSTDIR\$0 0 +2
+ Return
+
+ StrCpy $1 "@CPACK_DOWNLOAD_SITE@"
+
+ try_again:
+ NSISdl::download "$1/$0" "$INSTDIR\$0"
+
+ Pop $1
+ StrCmp $1 "success" success
+ StrCmp $1 "Cancelled" cancel
+ MessageBox MB_OK "Download failed: $1"
+ cancel:
+ Return
+ success:
+FunctionEnd
+!endif
+
+;--------------------------------
+; Installation types
+@CPACK_NSIS_INSTALLATION_TYPES@
+
+;--------------------------------
+; Component sections
+@CPACK_NSIS_COMPONENT_SECTIONS@
+
+;--------------------------------
+; Define some macro setting for the gui
+@CPACK_NSIS_INSTALLER_MUI_ICON_CODE@
+@CPACK_NSIS_INSTALLER_ICON_CODE@
+@CPACK_NSIS_INSTALLER_MUI_COMPONENTS_DESC@
+
+;--------------------------------
+;Pages
+ !insertmacro MUI_PAGE_WELCOME
+
+ !insertmacro MUI_PAGE_LICENSE "@CPACK_RESOURCE_FILE_LICENSE@"
+ Page custom InstallOptionsPage
+ !insertmacro MUI_PAGE_DIRECTORY
+
+ ;Start Menu Folder Page Configuration
+ !define MUI_STARTMENUPAGE_REGISTRY_ROOT "SHCTX"
+ !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
+ !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder"
+ !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
+
+ @CPACK_NSIS_PAGE_COMPONENTS@
+
+ !insertmacro MUI_PAGE_INSTFILES
+ !insertmacro MUI_PAGE_FINISH
+
+ !insertmacro MUI_UNPAGE_CONFIRM
+ !insertmacro MUI_UNPAGE_INSTFILES
+
+;--------------------------------
+;Languages
+
+ !insertmacro MUI_LANGUAGE "English" ;first language is the default language
+ !insertmacro MUI_LANGUAGE "Albanian"
+ !insertmacro MUI_LANGUAGE "Arabic"
+ !insertmacro MUI_LANGUAGE "Basque"
+ !insertmacro MUI_LANGUAGE "Belarusian"
+ !insertmacro MUI_LANGUAGE "Bosnian"
+ !insertmacro MUI_LANGUAGE "Breton"
+ !insertmacro MUI_LANGUAGE "Bulgarian"
+ !insertmacro MUI_LANGUAGE "Croatian"
+ !insertmacro MUI_LANGUAGE "Czech"
+ !insertmacro MUI_LANGUAGE "Danish"
+ !insertmacro MUI_LANGUAGE "Dutch"
+ !insertmacro MUI_LANGUAGE "Estonian"
+ !insertmacro MUI_LANGUAGE "Farsi"
+ !insertmacro MUI_LANGUAGE "Finnish"
+ !insertmacro MUI_LANGUAGE "French"
+ !insertmacro MUI_LANGUAGE "German"
+ !insertmacro MUI_LANGUAGE "Greek"
+ !insertmacro MUI_LANGUAGE "Hebrew"
+ !insertmacro MUI_LANGUAGE "Hungarian"
+ !insertmacro MUI_LANGUAGE "Icelandic"
+ !insertmacro MUI_LANGUAGE "Indonesian"
+ !insertmacro MUI_LANGUAGE "Irish"
+ !insertmacro MUI_LANGUAGE "Italian"
+ !insertmacro MUI_LANGUAGE "Japanese"
+ !insertmacro MUI_LANGUAGE "Korean"
+ !insertmacro MUI_LANGUAGE "Kurdish"
+ !insertmacro MUI_LANGUAGE "Latvian"
+ !insertmacro MUI_LANGUAGE "Lithuanian"
+ !insertmacro MUI_LANGUAGE "Luxembourgish"
+ !insertmacro MUI_LANGUAGE "Macedonian"
+ !insertmacro MUI_LANGUAGE "Malay"
+ !insertmacro MUI_LANGUAGE "Mongolian"
+ !insertmacro MUI_LANGUAGE "Norwegian"
+ !insertmacro MUI_LANGUAGE "Polish"
+ !insertmacro MUI_LANGUAGE "Portuguese"
+ !insertmacro MUI_LANGUAGE "PortugueseBR"
+ !insertmacro MUI_LANGUAGE "Romanian"
+ !insertmacro MUI_LANGUAGE "Russian"
+ !insertmacro MUI_LANGUAGE "Serbian"
+ !insertmacro MUI_LANGUAGE "SerbianLatin"
+ !insertmacro MUI_LANGUAGE "SimpChinese"
+ !insertmacro MUI_LANGUAGE "Slovak"
+ !insertmacro MUI_LANGUAGE "Slovenian"
+ !insertmacro MUI_LANGUAGE "Spanish"
+ !insertmacro MUI_LANGUAGE "Swedish"
+ !insertmacro MUI_LANGUAGE "Thai"
+ !insertmacro MUI_LANGUAGE "TradChinese"
+ !insertmacro MUI_LANGUAGE "Turkish"
+ !insertmacro MUI_LANGUAGE "Ukrainian"
+ !insertmacro MUI_LANGUAGE "Welsh"
+
+
+;--------------------------------
+;Reserve Files
+
+ ;These files should be inserted before other files in the data block
+ ;Keep these lines before any File command
+ ;Only for solid compression (by default, solid compression is enabled for BZIP2 and LZMA)
+
+ ReserveFile "NSIS.InstallOptions.ini"
+ !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+
+;--------------------------------
+;Installer Sections
+
+Section "-Core installation"
+ ;Use the entire tree produced by the INSTALL target. Keep the
+ ;list of directories here in sync with the RMDir commands below.
+ SetOutPath "$INSTDIR"
+ @CPACK_NSIS_FULL_INSTALL@
+
+ ;Store installation folder
+ WriteRegStr SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@" "" $INSTDIR
+
+ ;Create uninstaller
+ WriteUninstaller "$INSTDIR\Uninstall.exe"
+ Push "DisplayName"
+ Push "@CPACK_NSIS_DISPLAY_NAME@"
+ Call ConditionalAddToRegisty
+ Push "DisplayVersion"
+ Push "@CPACK_PACKAGE_VERSION@"
+ Call ConditionalAddToRegisty
+ Push "Publisher"
+ Push "@CPACK_PACKAGE_VENDOR@"
+ Call ConditionalAddToRegisty
+ Push "UninstallString"
+ Push "$INSTDIR\Uninstall.exe"
+ Call ConditionalAddToRegisty
+ Push "NoRepair"
+ Push "1"
+ Call ConditionalAddToRegisty
+
+ !ifdef CPACK_NSIS_ADD_REMOVE
+ ;Create add/remove functionality
+ Push "ModifyPath"
+ Push "$INSTDIR\AddRemove.exe"
+ Call ConditionalAddToRegisty
+ !else
+ Push "NoModify"
+ Push "1"
+ Call ConditionalAddToRegisty
+ !endif
+
+ ; Optional registration
+ Push "DisplayIcon"
+ Push "$INSTDIR\@CPACK_NSIS_INSTALLED_ICON_NAME@"
+ Call ConditionalAddToRegisty
+ Push "HelpLink"
+ Push "@CPACK_NSIS_HELP_LINK@"
+ Call ConditionalAddToRegisty
+ Push "URLInfoAbout"
+ Push "@CPACK_NSIS_URL_INFO_ABOUT@"
+ Call ConditionalAddToRegisty
+ Push "Contact"
+ Push "@CPACK_NSIS_CONTACT@"
+ Call ConditionalAddToRegisty
+ !insertmacro MUI_INSTALLOPTIONS_READ $INSTALL_DESKTOP "NSIS.InstallOptions.ini" "Field 5" "State"
+ !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
+
+ ;Create shortcuts
+ CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
+@CPACK_NSIS_CREATE_ICONS@
+ IntCmp $INSTALL_DESKTOP 0 noDesktopIcon
+@CPACK_NSIS_CREATE_ICONS_EXTRA@
+ noDesktopIcon:
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+
+ ;Read a value from an InstallOptions INI file
+ !insertmacro MUI_INSTALLOPTIONS_READ $DO_NOT_ADD_TO_PATH "NSIS.InstallOptions.ini" "Field 2" "State"
+ !insertmacro MUI_INSTALLOPTIONS_READ $ADD_TO_PATH_ALL_USERS "NSIS.InstallOptions.ini" "Field 3" "State"
+ !insertmacro MUI_INSTALLOPTIONS_READ $ADD_TO_PATH_CURRENT_USER "NSIS.InstallOptions.ini" "Field 4" "State"
+
+ ; Write special uninstall registry entries
+ Push "StartMenu"
+ Push "$STARTMENU_FOLDER"
+ Call ConditionalAddToRegisty
+ Push "DoNotAddToPath"
+ Push "$DO_NOT_ADD_TO_PATH"
+ Call ConditionalAddToRegisty
+ Push "AddToPathAllUsers"
+ Push "$ADD_TO_PATH_ALL_USERS"
+ Call ConditionalAddToRegisty
+ Push "AddToPathCurrentUser"
+ Push "$ADD_TO_PATH_CURRENT_USER"
+ Call ConditionalAddToRegisty
+ Push "InstallToDesktop"
+ Push "$INSTALL_DESKTOP"
+ Call ConditionalAddToRegisty
+
+ !insertmacro MUI_STARTMENU_WRITE_END
+
+@CPACK_NSIS_EXTRA_INSTALL_COMMANDS@
+
+SectionEnd
+
+section "-Add to path"
+ StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 doNotAddToPath
+ StrCmp $DO_NOT_ADD_TO_PATH "1" doNotAddToPath 0
+ Push $INSTDIR\bin
+ Call AddToPath
+ Push $INSTDIR\lib
+ Call AddToPath
+ doNotAddToPath:
+SectionEnd
+
+;--------------------------------
+; Create custom pages
+Function InstallOptionsPage
+ !insertmacro MUI_HEADER_TEXT "Install Options" "Choose options for installing @CPACK_NSIS_PACKAGE_NAME@"
+ !insertmacro MUI_INSTALLOPTIONS_DISPLAY "NSIS.InstallOptions.ini"
+
+FunctionEnd
+
+;--------------------------------
+; determine admin versus local install
+Function un.onInit
+
+ ClearErrors
+ UserInfo::GetName
+ IfErrors noLM
+ Pop $0
+ UserInfo::GetAccountType
+ Pop $1
+ StrCmp $1 "Admin" 0 +3
+ SetShellVarContext all
+ ;MessageBox MB_OK 'User "$0" is in the Admin group'
+ Goto done
+ StrCmp $1 "Power" 0 +3
+ SetShellVarContext all
+ ;MessageBox MB_OK 'User "$0" is in the Power Users group'
+ Goto done
+
+ noLM:
+ ;Get installation folder from registry if available
+
+ done:
+
+FunctionEnd
+
+;--- Add/Remove callback functions: ---
+!macro SectionList MacroName
+ ;This macro used to perform operation on multiple sections.
+ ;List all of your components in following manner here.
+@CPACK_NSIS_COMPONENT_SECTION_LIST@
+!macroend
+
+Section -FinishComponents
+ ;Removes unselected components and writes component status to registry
+ !insertmacro SectionList "FinishSection"
+
+!ifdef CPACK_NSIS_ADD_REMOVE
+ ; Get the name of the installer executable
+ System::Call 'kernel32::GetModuleFileNameA(i 0, t .R0, i 1024) i r1'
+ StrCpy $R3 $R0
+
+ ; Strip off the last 13 characters, to see if we have AddRemove.exe
+ StrLen $R1 $R0
+ IntOp $R1 $R0 - 13
+ StrCpy $R2 $R0 13 $R1
+ StrCmp $R2 "AddRemove.exe" addremove_installed
+
+ ; We're not running AddRemove.exe, so install it
+ CopyFiles $R3 $INSTDIR\AddRemove.exe
+
+ addremove_installed:
+!endif
+SectionEnd
+;--- End of Add/Remove callback functions ---
+
+;--------------------------------
+; Component dependencies
+Function .onSelChange
+ !insertmacro SectionList MaybeSelectionChanged
+FunctionEnd
+
+;--------------------------------
+;Uninstaller Section
+
+Section "Uninstall"
+ ReadRegStr $START_MENU SHCTX \
+ "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "StartMenu"
+ ;MessageBox MB_OK "Start menu is in: $START_MENU"
+ ReadRegStr $DO_NOT_ADD_TO_PATH SHCTX \
+ "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "DoNotAddToPath"
+ ReadRegStr $ADD_TO_PATH_ALL_USERS SHCTX \
+ "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "AddToPathAllUsers"
+ ReadRegStr $ADD_TO_PATH_CURRENT_USER SHCTX \
+ "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "AddToPathCurrentUser"
+ ;MessageBox MB_OK "Add to path: $DO_NOT_ADD_TO_PATH all users: $ADD_TO_PATH_ALL_USERS"
+ ReadRegStr $INSTALL_DESKTOP SHCTX \
+ "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@" "InstallToDesktop"
+ ;MessageBox MB_OK "Install to desktop: $INSTALL_DESKTOP "
+
+@CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS@
+
+ ;Remove files we installed.
+ ;Keep the list of directories here in sync with the File commands above.
+@CPACK_NSIS_DELETE_FILES@
+@CPACK_NSIS_DELETE_DIRECTORIES@
+
+!ifdef CPACK_NSIS_ADD_REMOVE
+ ;Remove the add/remove program
+ Delete "$INSTDIR\AddRemove.exe"
+!endif
+
+ ;Remove the uninstaller itself.
+ Delete "$INSTDIR\Uninstall.exe"
+ DeleteRegKey SHCTX "Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_NAME@"
+
+ ;Remove the installation directory if it is empty.
+ RMDir "$INSTDIR"
+
+ ; Remove the registry entries.
+ DeleteRegKey SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
+
+ ; Removes all optional components
+ !insertmacro SectionList "RemoveSection"
+
+ !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
+
+ Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+@CPACK_NSIS_DELETE_ICONS@
+ IntCmp $INSTALL_DESKTOP 0 noDesktopIcon
+@CPACK_NSIS_DELETE_ICONS_EXTRA@
+ noDesktopIcon:
+
+ ;Delete empty start menu parent diretories
+ StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
+
+ startMenuDeleteLoop:
+ ClearErrors
+ RMDir $MUI_TEMP
+ GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
+
+ IfErrors startMenuDeleteLoopDone
+
+ StrCmp "$MUI_TEMP" "$SMPROGRAMS" startMenuDeleteLoopDone startMenuDeleteLoop
+ startMenuDeleteLoopDone:
+
+ ; If the user changed the shortcut, then untinstall may not work. This should
+ ; try to fix it.
+ StrCpy $MUI_TEMP "$START_MENU"
+ Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
+;@CPACK_NSIS_DELETE_ICONS_EXTRA@
+
+ ;Delete empty start menu parent diretories
+ StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
+
+ secondStartMenuDeleteLoop:
+ ClearErrors
+ RMDir $MUI_TEMP
+ GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
+
+ IfErrors secondStartMenuDeleteLoopDone
+
+ StrCmp "$MUI_TEMP" "$SMPROGRAMS" secondStartMenuDeleteLoopDone secondStartMenuDeleteLoop
+ secondStartMenuDeleteLoopDone:
+
+ DeleteRegKey /ifempty SHCTX "Software\@CPACK_PACKAGE_VENDOR@\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@"
+
+ StrCmp $DO_NOT_ADD_TO_PATH_ "1" doNotRemoveFromPath 0
+ Push $INSTDIR\bin
+ Call un.RemoveFromPath
+ Push $INSTDIR\lib
+ Call un.RemoveFromPath
+ doNotRemoveFromPath:
+SectionEnd
+
+;--------------------------------
+; determine admin versus local install
+; Is install for "AllUsers" or "JustMe"?
+; Default to "JustMe" - set to "AllUsers" if admin or on Win9x
+; This function is used for the very first "custom page" of the installer.
+; This custom page does not show up visibly, but it executes prior to the
+; first visible page and sets up $INSTDIR properly...
+; Choose different default installation folder based on SV_ALLUSERS...
+; "Program Files" for AllUsers, "My Documents" for JustMe...
+
+Function .onInit
+ ; Reads components status for registry
+ !insertmacro SectionList "InitSection"
+
+ ; check to see if /D has been used to change
+ ; the install directory by comparing it to the
+ ; install directory that is expected to be the
+ ; default
+ StrCpy $IS_DEFAULT_INSTALLDIR 0
+ StrCmp "$INSTDIR" "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@" 0 +2
+ StrCpy $IS_DEFAULT_INSTALLDIR 1
+
+ StrCpy $SV_ALLUSERS "JustMe"
+ ; if default install dir then change the default
+ ; if it is installed for JustMe
+ StrCmp "$IS_DEFAULT_INSTALLDIR" "1" 0 +2
+ StrCpy $INSTDIR "$DOCUMENTS\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
+
+ ClearErrors
+ UserInfo::GetName
+ IfErrors noLM
+ Pop $0
+ UserInfo::GetAccountType
+ Pop $1
+ StrCmp $1 "Admin" 0 +3
+ SetShellVarContext all
+ ;MessageBox MB_OK 'User "$0" is in the Admin group'
+ StrCpy $SV_ALLUSERS "AllUsers"
+ Goto done
+ StrCmp $1 "Power" 0 +3
+ SetShellVarContext all
+ ;MessageBox MB_OK 'User "$0" is in the Power Users group'
+ StrCpy $SV_ALLUSERS "AllUsers"
+ Goto done
+
+ noLM:
+ StrCpy $SV_ALLUSERS "AllUsers"
+ ;Get installation folder from registry if available
+
+ done:
+ StrCmp $SV_ALLUSERS "AllUsers" 0 +3
+ StrCmp "$IS_DEFAULT_INSTALLDIR" "1" 0 +2
+ StrCpy $INSTDIR "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
+
+ StrCmp "@CPACK_NSIS_MODIFY_PATH@" "ON" 0 noOptionsPage
+ !insertmacro MUI_INSTALLOPTIONS_EXTRACT "NSIS.InstallOptions.ini"
+
+ noOptionsPage:
+FunctionEnd
View
2  tools/CMakeLists.txt
@@ -60,4 +60,4 @@ target_link_libraries(io basekit coroutine garbagecollector iovmall ${LIBS})
# The following add the install target, so we put io and io_static in our
# install prefix.
-install(TARGETS io io_static DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+install(TARGETS io io_static DESTINATION bin)
Please sign in to comment.
Something went wrong with that request. Please try again.