Permalink
Browse files

Unified ClientTools Packaging for OSX, Linux and Windows.

Changed default install location for ClientTools (???/HPCCSystems/3.8.0/clienttools)
Added third party dlls to windows + OSX install.
Removed invalid dependencies from DFU Plus
Removed OSSDIR from child projects and appended it to
CMAKE_INSTALL_PREFIX as needed.
Required folders now calculated relative to eclcc.
Include examples.

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>
  • Loading branch information...
GordonSmith committed Jun 28, 2012
1 parent c4d6853 commit 3dad731ee2d9ca39b79b946cf3561af9e6d1fdf0
Showing with 451 additions and 382 deletions.
  1. +29 −19 CMakeLists.txt
  2. +1 −0 build-config.h.cmake
  3. +10 −14 cmake_modules/commonSetup.cmake
  4. +9 −0 cmake_modules/optionDefaults.cmake
  5. +2 −2 common/CMakeLists.txt
  6. +1 −1 common/commonext/CMakeLists.txt
  7. +1 −1 common/deftype/CMakeLists.txt
  8. +1 −1 common/dllserver/CMakeLists.txt
  9. +1 −1 common/environment/CMakeLists.txt
  10. +2 −2 common/fileview2/CMakeLists.txt
  11. +1 −1 common/monitoring/CMakeLists.txt
  12. +1 −1 common/monitoring/prosysinfo/CMakeLists.txt
  13. +1 −1 common/remote/CMakeLists.txt
  14. +1 −1 common/remote/hooks/git/CMakeLists.txt
  15. +1 −1 common/remote/hooks/libarchive/CMakeLists.txt
  16. +1 −1 common/roxiecommlib/CMakeLists.txt
  17. +1 −1 common/roxiehelper/CMakeLists.txt
  18. +1 −1 common/roxiemanager/CMakeLists.txt
  19. +1 −1 common/thorhelper/CMakeLists.txt
  20. +1 −1 common/workunit/CMakeLists.txt
  21. +1 −1 common/wuwebview/CMakeLists.txt
  22. +3 −3 dali/CMakeLists.txt
  23. +1 −1 dali/base/CMakeLists.txt
  24. +1 −1 dali/dafilesrv/dafilesrv.cmake
  25. +1 −1 dali/dafilesrv/dafscontrol.cmake
  26. +1 −1 dali/daliadmin/CMakeLists.txt
  27. +1 −1 dali/dalidiag/CMakeLists.txt
  28. +1 −1 dali/dalistop/CMakeLists.txt
  29. +1 −1 dali/dfu/dfuserver.cmake
  30. +1 −1 dali/dfu/dfuwu.cmake
  31. +1 −1 dali/dfuXRefLib/CMakeLists.txt
  32. +1 −3 dali/dfuplus/CMakeLists.txt
  33. +1 −1 dali/dfuxref/CMakeLists.txt
  34. +1 −1 dali/ft/dalift.cmake
  35. +1 −1 dali/ft/ftslave.cmake
  36. +1 −1 dali/hellodali/CMakeLists.txt
  37. +1 −1 dali/regress/CMakeLists.txt
  38. +2 −2 dali/sasha/CMakeLists.txt
  39. +1 −1 dali/server/CMakeLists.txt
  40. +1 −1 dali/treeview/CMakeLists.txt
  41. +1 −1 dali/updtdalienv/CMakeLists.txt
  42. +5 −1 deploy/CMakeLists.txt
  43. +1 −1 deploy/gcc3/bin/CMakeLists.txt
  44. +19 −0 deploy/vc2008/CMakeLists.txt
  45. +20 −0 deploy/vc2008/bin/CMakeLists.txt
  46. +2 −2 deployment/CMakeLists.txt
  47. +1 −1 deployment/configgen/CMakeLists.txt
  48. +2 −2 deployment/deploy/CMakeLists.txt
  49. +1 −1 deployment/deployutils/CMakeLists.txt
  50. +1 −1 deployment/envgen/CMakeLists.txt
  51. +2 −2 ecl/CMakeLists.txt
  52. +1 −1 ecl/agentexec/CMakeLists.txt
  53. +1 −1 ecl/agentexec/agentexec.cmake
  54. +4 −2 ecl/ecl-package/CMakeLists.txt
  55. +2 −2 ecl/eclagent/CMakeLists.txt
  56. +1 −1 ecl/eclcc/CMakeLists.txt
  57. +31 −51 ecl/eclcc/eclcc.cpp
  58. +1 −1 ecl/eclccserver/CMakeLists.txt
  59. +1 −1 ecl/eclcmd/CMakeLists.txt
  60. +4 −2 ecl/eclcmd/queries/CMakeLists.txt
  61. +1 −1 ecl/eclplus/CMakeLists.txt
  62. +1 −1 ecl/eclscheduler/CMakeLists.txt
  63. +1 −1 ecl/hql/CMakeLists.txt
  64. +1 −1 ecl/hqlcpp/CMakeLists.txt
  65. +1 −1 ecl/hthor/CMakeLists.txt
  66. +1 −1 ecl/scheduleadmin/CMakeLists.txt
  67. +1 −1 ecl/schedulectrl/CMakeLists.txt
  68. +3 −3 ecllibrary/CMakeLists.txt
  69. +2 −2 esp/CMakeLists.txt
  70. +1 −1 esp/bindings/SOAP/soaplib/CMakeLists.txt
  71. +1 −1 esp/clients/LoggingClient/CMakeLists.txt
  72. +1 −1 esp/clients/WUManager/CMakeLists.txt
  73. +1 −1 esp/clients/wsecl/CMakeLists.txt
  74. +3 −3 esp/eclwatch/ws_XSLT/CMakeLists.txt
  75. +8 −8 esp/files/CMakeLists.txt
  76. +1 −1 esp/files/css/CMakeLists.txt
  77. +1 −1 esp/files/html/CMakeLists.txt
  78. +2 −2 esp/files/img/CMakeLists.txt
  79. +1 −1 esp/files/logo/CMakeLists.txt
  80. +1 −1 esp/files/scripts/CMakeLists.txt
  81. +1 −1 esp/files/scripts/configmgr/CMakeLists.txt
  82. +1 −1 esp/platform/CMakeLists.txt
  83. +1 −1 esp/protocols/http/CMakeLists.txt
  84. +3 −1 esp/scm/espscm.cmake
  85. +2 −2 esp/services/CMakeLists.txt
  86. +1 −1 esp/services/WsDeploy/CMakeLists.txt
  87. +1 −1 esp/services/ecldirect/CMakeLists.txt
  88. +1 −1 esp/services/esp_compile_scm/CMakeLists.txt
  89. +1 −1 esp/services/ws_access/CMakeLists.txt
  90. +1 −1 esp/services/ws_account/CMakeLists.txt
  91. +1 −1 esp/services/ws_config/CMakeLists.txt
  92. +1 −1 esp/services/ws_dfu/CMakeLists.txt
  93. +1 −1 esp/services/ws_ecl/CMakeLists.txt
  94. +1 −1 esp/services/ws_fileio/CMakeLists.txt
  95. +1 −1 esp/services/ws_fs/CMakeLists.txt
  96. +2 −2 esp/services/ws_machine/CMakeLists.txt
  97. +1 −1 esp/services/ws_packageprocess/CMakeLists.txt
  98. +1 −1 esp/services/ws_roxiequery/CMakeLists.txt
  99. +1 −1 esp/services/ws_smc/CMakeLists.txt
  100. +1 −1 esp/services/ws_topology/CMakeLists.txt
  101. +1 −1 esp/services/ws_workunits/CMakeLists.txt
  102. +1 −1 esp/smc/SMCLib/CMakeLists.txt
  103. +3 −3 esp/tools/soapplus/CMakeLists.txt
  104. +2 −2 esp/xslt/CMakeLists.txt
  105. +26 −24 initfiles/CMakeLists.txt
  106. +2 −2 initfiles/bash/etc/init.d/CMakeLists.txt
  107. +1 −1 initfiles/bin/CMakeLists.txt
  108. +1 −1 initfiles/componentfiles/configxml/@temp/CMakeLists.txt
  109. +1 −1 initfiles/componentfiles/configxml/CMakeLists.txt
  110. +1 −1 initfiles/componentfiles/ftslave/CMakeLists.txt
  111. +1 −1 initfiles/componentfiles/thor/CMakeLists.txt
  112. +2 −2 initfiles/etc/DIR_NAME/CMakeLists.txt
  113. +2 −2 initfiles/etc/DIR_NAME/configmgr/CMakeLists.txt
  114. +2 −2 initfiles/etc/sshkey/.ssh/CMakeLists.txt
  115. +1 −1 initfiles/etc/sshkey/CMakeLists.txt
  116. +1 −1 initfiles/sbin/CMakeLists.txt
  117. +33 −13 lib2/CMakeLists.txt
  118. +1 −1 plugins/auditlib/CMakeLists.txt
  119. +1 −1 plugins/dbconnectors/hpccjdbc/CMakeLists.txt
  120. +1 −1 plugins/debugservices/CMakeLists.txt
  121. +1 −1 plugins/fileservices/CMakeLists.txt
  122. +1 −1 plugins/logging/CMakeLists.txt
  123. +1 −1 plugins/parselib/CMakeLists.txt
  124. +1 −1 plugins/stringlib/CMakeLists.txt
  125. +1 −1 plugins/unicodelib/CMakeLists.txt
  126. +1 −1 plugins/workunitservices/CMakeLists.txt
  127. +7 −7 roxie/CMakeLists.txt
  128. +1 −1 roxie/ccd/CMakeLists.txt
  129. +1 −1 roxie/roxie/CMakeLists.txt
  130. +1 −1 roxie/roxieclient/CMakeLists.txt
  131. +1 −1 roxie/roxiemem/CMakeLists.txt
  132. +1 −1 roxie/roxiepipe/CMakeLists.txt
  133. +1 −1 roxie/udplib/udplib.cmake
  134. +1 −1 roxie/udplib/udptransport.cmake
  135. +2 −2 rtl/CMakeLists.txt
  136. +2 −2 rtl/eclrtl/CMakeLists.txt
  137. +1 −1 rtl/ecltpl/CMakeLists.txt
  138. +1 −1 rtl/include/CMakeLists.txt
  139. +1 −1 rtl/nbcd/CMakeLists.txt
  140. +1 −1 services/runagent/frunagent.cmake
  141. +1 −1 services/runagent/frunssh.cmake
  142. +2 −12 system/hrpc/CMakeLists.txt
  143. +1 −1 system/include/CMakeLists.txt
  144. +1 −1 system/jhtree/CMakeLists.txt
  145. +3 −2 system/jlib/CMakeLists.txt
  146. +2 −1 system/jlib/jlog.cpp
  147. +43 −29 system/jlib/jutil.cpp
  148. +1 −1 system/jlib/jutil.hpp
  149. +0 −2 system/lzma/CMakeLists.txt
  150. +1 −1 system/mp/CMakeLists.txt
  151. +1 −1 system/security/LdapSecurity/CMakeLists.txt
  152. +1 −1 system/security/securesocket/CMakeLists.txt
  153. +1 −1 system/security/test/myssl/CMakeLists.txt
  154. +1 −1 system/security/zcrypt/CMakeLists.txt
  155. +1 −1 system/xmllib/CMakeLists.txt
  156. +1 −1 system/xmllibtest/CMakeLists.txt
  157. +1 −1 thorlcr/activities/activitymasters_lcr.cmake
  158. +1 −1 thorlcr/activities/activityslaves_lcr.cmake
  159. +1 −1 thorlcr/graph/graph_lcr.cmake
  160. +1 −1 thorlcr/graph/graphmaster_lcr.cmake
  161. +1 −1 thorlcr/graph/graphslave_lcr.cmake
  162. +1 −1 thorlcr/master/CMakeLists.txt
  163. +1 −1 thorlcr/mfilemanager/CMakeLists.txt
  164. +1 −1 thorlcr/msort/CMakeLists.txt
  165. +1 −1 thorlcr/slave/CMakeLists.txt
  166. +1 −1 thorlcr/thorcodectx/CMakeLists.txt
  167. +1 −1 tools/backupnode/CMakeLists.txt
  168. +1 −1 tools/combine/CMakeLists.txt
  169. +1 −1 tools/copyexp/CMakeLists.txt
  170. +1 −1 tools/dumpkey/CMakeLists.txt
  171. +1 −1 tools/esdl/CMakeLists.txt
  172. +1 −1 tools/esdl/esdl.cmake
  173. +1 −1 tools/fcached/CMakeLists.txt
  174. +1 −1 tools/genht/CMakeLists.txt
  175. +1 −1 tools/hidl/CMakeLists.txt
  176. +1 −1 tools/keydiff/CMakeLists.txt
  177. +1 −1 tools/keydiff/keydiff.cmake
  178. +1 −1 tools/keydiff/keypatch.cmake
  179. +1 −1 tools/start-stop-daemon/CMakeLists.txt
  180. +1 −1 tools/swapnode/swapnode.cmake
  181. +1 −1 tools/swapnode/swapnodelib.cmake
  182. +2 −2 tools/testsocket/CMakeLists.txt
  183. +1 −1 tools/vkey/CMakeLists.txt
  184. +1 −1 tools/wuget/CMakeLists.txt
  185. +1 −1 tools/xmlsize/CMakeLists.txt
View
@@ -102,29 +102,27 @@ include(${HPCC_SOURCE_DIR}/cmake_modules/optionDefaults.cmake)
include(${HPCC_SOURCE_DIR}/cmake_modules/commonSetup.cmake)
if ( NOT MAKE_DOCS_ONLY )
- if ( CMAKE_SYSTEM MATCHES Linux )
- HPCC_ADD_SUBDIRECTORY (initfiles)
- endif ()
+ HPCC_ADD_SUBDIRECTORY (initfiles)
HPCC_ADD_SUBDIRECTORY (tools)
HPCC_ADD_SUBDIRECTORY (common)
HPCC_ADD_SUBDIRECTORY (dali)
- HPCC_ADD_SUBDIRECTORY (deploy "PLATFORM")
+ HPCC_ADD_SUBDIRECTORY (deploy)
HPCC_ADD_SUBDIRECTORY (deployment)
HPCC_ADD_SUBDIRECTORY (ecl)
HPCC_ADD_SUBDIRECTORY (ecllibrary)
HPCC_ADD_SUBDIRECTORY (esp)
HPCC_ADD_SUBDIRECTORY (plugins)
- HPCC_ADD_SUBDIRECTORY (roxie "PLATFORM")
+ HPCC_ADD_SUBDIRECTORY (roxie)
HPCC_ADD_SUBDIRECTORY (rtl)
HPCC_ADD_SUBDIRECTORY (services "PLATFORM")
HPCC_ADD_SUBDIRECTORY (system)
HPCC_ADD_SUBDIRECTORY (thorlcr "PLATFORM")
HPCC_ADD_SUBDIRECTORY (testing)
endif()
HPCC_ADD_SUBDIRECTORY (docs "PLATFORM")
-if (APPLE)
+if (APPLE OR WIN32)
HPCC_ADD_SUBDIRECTORY (lib2)
-endif (APPLE)
+endif (APPLE OR WIN32)
###
## CPack install and packaging setup.
@@ -151,7 +149,8 @@ set(CPACK_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}-${CPACK_RPM_PACKAGE_ARCHITECTURE}")
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
set(CPACK_STRIP_FILES TRUE)
endif()
-if ( CMAKE_SYSTEM MATCHES Linux )
+if ( APPLE )
+elseif ( UNIX )
EXECUTE_PROCESS (
COMMAND ${HPCC_SOURCE_DIR}/cmake_modules/distrocheck.sh
OUTPUT_VARIABLE packageManagement
@@ -167,18 +166,18 @@ if ( CMAKE_SYSTEM MATCHES Linux )
OUTPUT_VARIABLE packageRevision
ERROR_VARIABLE packageRevision
)
-
+
message ( "-- Auto Detecting Packaging type")
message ( "-- distro uses ${packageManagement}, revision is ${packageRevisionArch}" )
if ( ${packageManagement} STREQUAL "DEB" )
- set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_RPM_PACKAGE_VERSION}-${version}-${stagever}${packageRevisionArch}")
+ set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_RPM_PACKAGE_VERSION}-${version}-${stagever}${packageRevisionArch}")
elseif ( ${packageManagement} STREQUAL "RPM" )
- set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_RPM_PACKAGE_VERSION}-${version}-${stagever}.${packageRevisionArch}")
+ set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_RPM_PACKAGE_VERSION}-${version}-${stagever}.${packageRevisionArch}")
else()
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_RPM_PACKAGE_VERSION}_${version}-${stagever}${CPACK_SYSTEM_NAME}")
endif ()
-endif ( CMAKE_SYSTEM MATCHES Linux )
+endif ()
MESSAGE ("-- Current release version is ${CPACK_PACKAGE_FILE_NAME}")
set ( CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_RPM_PACKAGE_VERSION}-${version}" )
set( CPACK_SOURCE_GENERATOR TGZ )
@@ -243,8 +242,8 @@ configure_file(${HPCC_SOURCE_DIR}/build-config.h.cmake "build-config.h" )
###
if (NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.1")
- if ( CMAKE_SYSTEM MATCHES Linux )
- if ( ${packageManagement} STREQUAL "DEB" )
+ if ( UNIX )
+ if ( "${packageManagement}" STREQUAL "DEB" )
if ("${CMAKE_VERSION}" VERSION_EQUAL "2.8.2")
message("WARNING: CMAKE 2.8.2 would not build DEB package")
else ()
@@ -257,7 +256,7 @@ if (NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.1")
set ( CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_BINARY_DIR}/initfiles/bash/sbin/deb/postinst;${CMAKE_CURRENT_BINARY_DIR}/initfiles/sbin/prerm;${CMAKE_CURRENT_BINARY_DIR}/initfiles/bash/sbin/deb/postrm" )
endif ()
- elseif ( ${packageManagement} STREQUAL "RPM" )
+ elseif ( "${packageManagement}" STREQUAL "RPM" )
set ( CPACK_GENERATOR "${packageManagement}" )
###
## CPack instruction required for RPM
@@ -272,7 +271,7 @@ if (NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.1")
message("WARNING: Unsupported package ${packageManagement}.")
endif ()
- endif ( CMAKE_SYSTEM MATCHES Linux )
+ endif ( UNIX )
if ( EXISTS ${HPCC_SOURCE_DIR}/cmake_modules/dependencies/${packageRevision}.cmake )
include( ${HPCC_SOURCE_DIR}/cmake_modules/dependencies/${packageRevision}.cmake )
else()
@@ -283,7 +282,9 @@ else()
message("WARNING: CMAKE 2.8.1 or later required to create RPMs from this project")
endif()
-if (APPLE)
+if ( PLATFORM )
+ set ( CPACK_PACKAGING_INSTALL_PREFIX "${PREFIX}/${DIR_NAME}" )
+else ( PLATFORM )
set ( CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_RPM_PACKAGE_VERSION}-${version}-${stagever}-${CPACK_SYSTEM_NAME}")
set ( CPACK_MONOLITHIC_INSTALL TRUE )
set ( CPACK_PACKAGE_VENDOR "HPCC Systems" )
@@ -294,12 +295,21 @@ if (APPLE)
set ( CPACK_RESOURCE_FILE_README "${PROJECT_BINARY_DIR}/welcome.txt" )
set ( CPACK_RESOURCE_FILE_LICENSE "${HPCC_SOURCE_DIR}/${LICENSE_FILE}" )
set ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "HPCC Systems Client Tools." )
-endif()
+ if (WIN32)
+ set ( CPACK_NSIS_DISPLAY_NAME "Client Tools" )
+ set ( CPACK_PACKAGE_INSTALL_DIRECTORY "${DIR_NAME}\\\\${version}\\\\clienttools")
+ set ( CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${DIR_NAME}\\\\${version}\\\\clienttools")
+ set ( CPACK_NSIS_DEFINES "
+ !define MUI_STARTMENUPAGE_DEFAULTFOLDER \\\"${CPACK_PACKAGE_VENDOR}\\\\${CPACK_NSIS_DISPLAY_NAME}\\\"
+ !define MUI_FINISHPAGE_NOAUTOCLOSE
+ ")
+ endif()
+endif( PLATFORM )
###
## Below are the non-compile based install scripts required for
## the hpcc platform.
###
-Install ( FILES ${HPCC_SOURCE_DIR}/${LICENSE_FILE} DESTINATION ${OSSDIR} COMPONENT Runtime )
+Install ( FILES ${HPCC_SOURCE_DIR}/${LICENSE_FILE} DESTINATION "." COMPONENT Runtime )
include (CPack)
View
@@ -89,3 +89,4 @@
#ifndef BUILD_LEVEL
#cmakedefine BUILD_LEVEL "${BUILD_LEVEL}"
#endif
+
@@ -502,22 +502,18 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
## The following sets the install directories and names.
###
if ( PLATFORM )
- set ( OSSDIR "${DIR_NAME}" )
- else()
- set ( OSSDIR "${DIR_NAME}/${version}/clienttools" )
- endif()
- set ( CPACK_INSTALL_PREFIX "${PREFIX}" )
- set ( CPACK_PACKAGING_INSTALL_PREFIX "${PREFIX}" )
- set ( CMAKE_INSTALL_PREFIX "${PREFIX}" )
- SET(CMAKE_SKIP_BUILD_RPATH FALSE)
- SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OSSDIR}/lib")
- SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ set ( CMAKE_INSTALL_PREFIX "${PREFIX}/${DIR_NAME}" )
+ else ( PLATFORM )
+ set ( CMAKE_INSTALL_PREFIX "${PREFIX}/${DIR_NAME}/${version}/clienttools" )
+ endif ( PLATFORM )
+ set (CMAKE_SKIP_BUILD_RPATH FALSE)
+ set (CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+ set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_DIR}")
+ set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
if (APPLE)
- set(CMAKE_INSTALL_RPATH "@loader_path/../lib")
- set(CMAKE_INSTALL_NAME_DIR "@loader_path/../lib")
+ set(CMAKE_INSTALL_RPATH "@loader_path/../${LIB_DIR}")
+ set(CMAKE_INSTALL_NAME_DIR "@loader_path/../${LIB_DIR}")
endif()
-
MACRO (FETCH_GIT_TAG workdir edition result)
execute_process(COMMAND "${GIT_COMMAND}" describe --tags --dirty --abbrev=6 --match ${edition}*
WORKING_DIRECTORY "${workdir}"
@@ -1,6 +1,11 @@
if ( NOT PREFIX )
+if ( WIN32 )
+ set( PREFIX "$ENV{ProgramFiles(x86)}" )
+ string(REGEX REPLACE "\\\\" "/" PREFIX ${PREFIX})
+else (WIN32)
set( PREFIX "/opt" )
+endif (WIN32)
endif()
if ( NOT EXEC_PREFIX )
@@ -15,6 +20,10 @@ if ( NOT DIR_NAME )
set( DIR_NAME "HPCCSystems" )
endif()
+if ( NOT ARCHIVE_DIR )
+ set( ARCHIVE_DIR "lib" )
+endif()
+
if ( NOT LIB_DIR )
set( LIB_DIR "lib" )
endif()
View
@@ -20,11 +20,11 @@ HPCC_ADD_SUBDIRECTORY (commonext)
HPCC_ADD_SUBDIRECTORY (deftype)
HPCC_ADD_SUBDIRECTORY (dllserver)
HPCC_ADD_SUBDIRECTORY (environment)
-HPCC_ADD_SUBDIRECTORY (fileview2)
+HPCC_ADD_SUBDIRECTORY (fileview2 "PLATFORM")
HPCC_ADD_SUBDIRECTORY (monitoring "PLATFORM")
HPCC_ADD_SUBDIRECTORY (remote)
HPCC_ADD_SUBDIRECTORY (roxiecommlib)
-HPCC_ADD_SUBDIRECTORY (roxiehelper "PLATFORM")
+HPCC_ADD_SUBDIRECTORY (roxiehelper)
HPCC_ADD_SUBDIRECTORY (roxiemanager "PLATFORM")
HPCC_ADD_SUBDIRECTORY (thorhelper)
HPCC_ADD_SUBDIRECTORY (workunit)
@@ -43,7 +43,7 @@ ADD_DEFINITIONS( -D_USRDLL -DCOMMONEXT_EXPORTS )
HPCC_ADD_LIBRARY( commonext SHARED ${SRCS} )
add_dependencies (commonext espscm )
-install ( TARGETS commonext DESTINATION ${OSSDIR}/lib )
+install ( TARGETS commonext RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
target_link_libraries ( commonext
jlib
)
@@ -47,7 +47,7 @@ include_directories (
ADD_DEFINITIONS( -D_USRDLL -DDEFTYPE_EXPORTS )
HPCC_ADD_LIBRARY( deftype SHARED ${SRCS} )
-install ( TARGETS deftype DESTINATION ${OSSDIR}/lib )
+install ( TARGETS deftype RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
target_link_libraries ( deftype
jlib
nbcd
@@ -50,7 +50,7 @@ ENDIF()
ADD_DEFINITIONS( -D_USRDLL -DDLLSERVER_EXPORTS )
HPCC_ADD_LIBRARY( dllserver SHARED ${SRCS} )
-install ( TARGETS dllserver DESTINATION ${OSSDIR}/lib )
+install ( TARGETS dllserver RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
target_link_libraries ( dllserver
${ZLIB_LIBRARIES}
jlib
@@ -45,7 +45,7 @@ include_directories (
ADD_DEFINITIONS( -D_USRDLL -DENVIRONMENT_EXPORTS )
HPCC_ADD_LIBRARY( environment SHARED ${SRCS} ${INCLUDES} )
-install ( TARGETS environment DESTINATION ${OSSDIR}/lib )
+install ( TARGETS environment RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
target_link_libraries ( environment
jlib
mp
@@ -82,7 +82,7 @@ HPCC_ADD_LIBRARY( fileview2 SHARED ${SRCS} )
set_target_properties(fileview2 PROPERTIES
COMPILE_FLAGS -D_USRDLL
DEFINE_SYMBOL FILEVIEW2_EXPORTS )
-install ( TARGETS fileview2 DESTINATION ${OSSDIR}/lib )
+install ( TARGETS fileview2 RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
target_link_libraries ( fileview2
jlib
mp
@@ -111,7 +111,7 @@ if( PLATFORM )
set_target_properties(fvserver PROPERTIES
COMPILE_FLAGS -D_CONSOLE
)
- #install ( TARGETS fvserver DESTINATION ${OSSDIR}/bin ) #not used at present
+ #install ( TARGETS fvserver RUNTIME DESTINATION ${EXEC_DIR} ) #not used at present
target_link_libraries ( fvserver
jlib
@@ -18,4 +18,4 @@
################################################################################
add_subdirectory (prosysinfo)
-Install ( PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/preflight DESTINATION ${OSSDIR}/sbin COMPONENT Runtime )
+Install ( PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/preflight DESTINATION sbin COMPONENT Runtime )
@@ -30,4 +30,4 @@ set ( SRCS
)
HPCC_ADD_EXECUTABLE ( prosysinfo ${SRCS} )
-install ( TARGETS prosysinfo DESTINATION ${OSSDIR}/bin )
+install ( TARGETS prosysinfo RUNTIME DESTINATION ${EXEC_DIR} )
@@ -61,7 +61,7 @@ include_directories (
ADD_DEFINITIONS( -D_USRDLL -DREMOTE_EXPORTS )
HPCC_ADD_LIBRARY( remote SHARED ${SRCS} )
-install ( TARGETS remote DESTINATION ${OSSDIR}/lib )
+install ( TARGETS remote RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
target_link_libraries ( remote
jlib
@@ -38,7 +38,7 @@ include_directories (
ADD_DEFINITIONS( -D_USRDLL -DGITFILE_EXPORTS )
HPCC_ADD_LIBRARY( gitfile SHARED ${SRCS} )
-install ( TARGETS gitfile DESTINATION ${OSSDIR}/filehooks )
+install ( TARGETS gitfile DESTINATION filehooks )
target_link_libraries ( gitfile
jlib
@@ -40,7 +40,7 @@ include_directories ( ${LIBARCHIVE_INCLUDE_DIR} )
ADD_DEFINITIONS( -D_USRDLL -DARCHIVEFILE_EXPORTS )
HPCC_ADD_LIBRARY( archivefile SHARED ${SRCS} )
-install ( TARGETS archivefile DESTINATION ${OSSDIR}/filehooks )
+install ( TARGETS archivefile DESTINATION filehooks )
target_link_libraries ( archivefile
jlib
@@ -58,7 +58,7 @@ ADD_DEFINITIONS( -D_USRDLL -DROXIECOMMLIB_EXPORTS )
HPCC_ADD_LIBRARY( roxiecommlib SHARED ${SRCS} )
add_dependencies( roxiecommlib espscm )
-install ( TARGETS roxiecommlib DESTINATION ${OSSDIR}/lib )
+install ( TARGETS roxiecommlib RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
target_link_libraries ( roxiecommlib
jlib
)
@@ -48,7 +48,7 @@ set ( SRCS roxiehelper.cpp roxiedebug.cpp
roxiehelper.hpp roxiedebug.hpp roxielmj.hpp)
HPCC_ADD_LIBRARY( roxiehelper SHARED ${SRCS} )
-install ( TARGETS roxiehelper DESTINATION ${OSSDIR}/lib )
+install ( TARGETS roxiehelper RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
target_link_libraries ( roxiehelper
jlib
eclrtl
@@ -69,7 +69,7 @@ ADD_DEFINITIONS( -D_USRDLL -DROXIEMANAGER_EXPORTS )
HPCC_ADD_LIBRARY( roxiemanager SHARED ${SRCS} )
add_dependencies( roxiemanager espscm )
-install ( TARGETS roxiemanager DESTINATION ${OSSDIR}/lib )
+install ( TARGETS roxiemanager RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
target_link_libraries ( roxiemanager
jlib
roxiecommlib
@@ -73,7 +73,7 @@ include_directories (
ADD_DEFINITIONS( -DTHORHELPER_EXPORTS -D_USRDLL )
HPCC_ADD_LIBRARY( thorhelper SHARED ${SRCS} )
-install ( TARGETS thorhelper DESTINATION ${OSSDIR}/lib )
+install ( TARGETS thorhelper RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
target_link_libraries ( thorhelper
jlib
nbcd
@@ -54,7 +54,7 @@ HPCC_ADD_LIBRARY( workunit SHARED ${SRCS} )
set_target_properties(workunit PROPERTIES
COMPILE_FLAGS -D_USRDLL
DEFINE_SYMBOL WORKUNIT_EXPORTS )
-install ( TARGETS workunit DESTINATION ${OSSDIR}/lib )
+install ( TARGETS workunit RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
target_link_libraries ( workunit
jlib
dalibase
@@ -44,7 +44,7 @@ HPCC_ADD_LIBRARY( wuwebview SHARED ${SRCS} )
set_target_properties(wuwebview PROPERTIES
COMPILE_FLAGS -D_USRDLL
DEFINE_SYMBOL WUWEBVIEW_EXPORTS )
-install ( TARGETS wuwebview DESTINATION ${OSSDIR}/lib )
+install ( TARGETS wuwebview RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
target_link_libraries ( wuwebview
jlib
workunit
View
@@ -17,17 +17,17 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
################################################################################
HPCC_ADD_SUBDIRECTORY (base)
-HPCC_ADD_SUBDIRECTORY (dafilesrv)
+HPCC_ADD_SUBDIRECTORY (dafilesrv "PLATFORM")
HPCC_ADD_SUBDIRECTORY (dalidiag "PLATFORM")
HPCC_ADD_SUBDIRECTORY (dalistop "PLATFORM")
HPCC_ADD_SUBDIRECTORY (datest "PLATFORM")
if (USE_CPPUNIT)
HPCC_ADD_SUBDIRECTORY (daunittest "PLATFORM")
endif()
-HPCC_ADD_SUBDIRECTORY (dfu)
+HPCC_ADD_SUBDIRECTORY (dfu "PLATFORM")
HPCC_ADD_SUBDIRECTORY (dfuplus "CLIENTTOOLS")
HPCC_ADD_SUBDIRECTORY (dfuxref "PLATFORM")
-HPCC_ADD_SUBDIRECTORY (dfuXRefLib)
+HPCC_ADD_SUBDIRECTORY (dfuXRefLib "PLATFORM")
HPCC_ADD_SUBDIRECTORY (ft)
HPCC_ADD_SUBDIRECTORY (regress "PLATFORM")
HPCC_ADD_SUBDIRECTORY (daliadmin "PLATFORM")
View
@@ -68,7 +68,7 @@ include_directories (
ADD_DEFINITIONS( -DLOGMSGCOMPONENT=3 -D_USRDLL -DDALI_EXPORTS )
HPCC_ADD_LIBRARY( dalibase SHARED ${SRCS} ${INCLUDES} )
-install ( TARGETS dalibase DESTINATION ${OSSDIR}/lib )
+install ( TARGETS dalibase RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
target_link_libraries ( dalibase
jlib
mp
@@ -41,7 +41,7 @@ endif()
HPCC_ADD_EXECUTABLE ( dafilesrv ${SRCS} )
set_target_properties (dafilesrv PROPERTIES COMPILE_FLAGS -D_CONSOLE)
-install ( TARGETS dafilesrv DESTINATION ${OSSDIR}/bin )
+install ( TARGETS dafilesrv RUNTIME DESTINATION ${EXEC_DIR} )
target_link_libraries ( dafilesrv
jlib
remote
Oops, something went wrong.

0 comments on commit 3dad731

Please sign in to comment.