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>

CMakeLists.txt

@@ -102,19 +102,17 @@ 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)
@@ -122,9 +120,9 @@ if ( NOT MAKE_DOCS_ONLY )
     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)

build-config.h.cmake

@@ -89,3 +89,4 @@
 #ifndef BUILD_LEVEL
     #cmakedefine BUILD_LEVEL "${BUILD_LEVEL}"
 #endif
+

cmake_modules/commonSetup.cmake

@@ -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}"

cmake_modules/optionDefaults.cmake

@@ -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()

common/CMakeLists.txt

@@ -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)

common/commonext/CMakeLists.txt

@@ -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 
     )

common/deftype/CMakeLists.txt

@@ -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

common/dllserver/CMakeLists.txt

@@ -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 

common/environment/CMakeLists.txt

@@ -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 

common/fileview2/CMakeLists.txt

@@ -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 

common/monitoring/CMakeLists.txt

@@ -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 )

common/monitoring/prosysinfo/CMakeLists.txt

@@ -30,4 +30,4 @@ set (    SRCS
     )
 
 HPCC_ADD_EXECUTABLE ( prosysinfo ${SRCS} )
-install ( TARGETS prosysinfo DESTINATION ${OSSDIR}/bin )
+install ( TARGETS prosysinfo RUNTIME DESTINATION ${EXEC_DIR} )

common/remote/CMakeLists.txt

@@ -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 

common/remote/hooks/git/CMakeLists.txt

@@ -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

common/remote/hooks/libarchive/CMakeLists.txt

@@ -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

common/roxiecommlib/CMakeLists.txt

@@ -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 
     )

common/roxiehelper/CMakeLists.txt

@@ -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 

common/roxiemanager/CMakeLists.txt

@@ -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 

common/thorhelper/CMakeLists.txt

@@ -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 

common/workunit/CMakeLists.txt

@@ -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 

common/wuwebview/CMakeLists.txt

@@ -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

dali/CMakeLists.txt

@@ -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")

dali/base/CMakeLists.txt

@@ -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 

dali/dafilesrv/dafilesrv.cmake

@@ -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

dali/dafilesrv/dafscontrol.cmake

@@ -42,7 +42,7 @@ include_directories (
 
 HPCC_ADD_EXECUTABLE ( dafscontrol ${SRCS} )
 set_target_properties (dafscontrol PROPERTIES COMPILE_FLAGS -D_CONSOLE)
-install ( TARGETS dafscontrol DESTINATION ${OSSDIR}/bin )
+install ( TARGETS dafscontrol RUNTIME DESTINATION ${EXEC_DIR} )
 target_link_libraries ( dafscontrol  
          jlib
          mp 

dali/daliadmin/CMakeLists.txt

@@ -43,7 +43,7 @@ include_directories (
 ADD_DEFINITIONS( -D_CONSOLE )
 
 HPCC_ADD_EXECUTABLE ( daliadmin ${SRCS} )
-install ( TARGETS daliadmin DESTINATION ${OSSDIR}/bin )
+install ( TARGETS daliadmin RUNTIME DESTINATION ${EXEC_DIR} )
 target_link_libraries ( daliadmin  
          jlib
          mp 

dali/dalidiag/CMakeLists.txt

@@ -41,7 +41,7 @@ include_directories (
 ADD_DEFINITIONS( -D_CONSOLE )
 
 HPCC_ADD_EXECUTABLE ( dalidiag ${SRCS} )
-install ( TARGETS dalidiag DESTINATION ${OSSDIR}/bin )
+install ( TARGETS dalidiag RUNTIME DESTINATION ${EXEC_DIR} )
 target_link_libraries ( dalidiag 
          jlib
          mp 

dali/dalistop/CMakeLists.txt

@@ -41,7 +41,7 @@ include_directories (
 ADD_DEFINITIONS( -D_CONSOLE )
 
 HPCC_ADD_EXECUTABLE ( dalistop ${SRCS} )
-install ( TARGETS dalistop DESTINATION ${OSSDIR}/bin )
+install ( TARGETS dalistop RUNTIME DESTINATION ${EXEC_DIR} )
 target_link_libraries ( dalistop 
          jlib
          mp 

dali/dfu/dfuserver.cmake

@@ -52,7 +52,7 @@ HPCC_ADD_EXECUTABLE ( dfuserver ${SRCS} )
 set_target_properties ( dfuserver PROPERTIES 
         COMPILE_FLAGS "-D_CONSOLE -D_DFUSERVER"
         )
-install ( TARGETS dfuserver DESTINATION ${OSSDIR}/bin )
+install ( TARGETS dfuserver RUNTIME DESTINATION ${EXEC_DIR} )
 target_link_libraries ( dfuserver 
          jlib
          mp 

dali/dfu/dfuwu.cmake

@@ -45,7 +45,7 @@ set_target_properties ( dfuwu PROPERTIES
         COMPILE_FLAGS "-DLOGMSGCOMPONENT=3 -D_USRDLL"
         DEFINE_SYMBOL DALI_EXPORTS 
         )
-install ( TARGETS dfuwu DESTINATION ${OSSDIR}/lib )
+install ( TARGETS dfuwu RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
 target_link_libraries ( dfuwu 
          workunit
          jlib

dali/dfuXRefLib/CMakeLists.txt

@@ -51,7 +51,7 @@ include_directories (
 ADD_DEFINITIONS( -D_USRDLL -DDFUXREFLIB_EXPORTS )
 
 HPCC_ADD_LIBRARY( dfuXRefLib SHARED ${SRCS} )
-install ( TARGETS dfuXRefLib DESTINATION ${OSSDIR}/lib )
+install ( TARGETS dfuXRefLib RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
 target_link_libraries ( dfuXRefLib
          jlib
          mp 

dali/dfuplus/CMakeLists.txt

@@ -59,14 +59,12 @@ ADD_DEFINITIONS( -D_CONSOLE )
 
 HPCC_ADD_EXECUTABLE ( dfuplus ${SRCS} )
 add_dependencies ( dfuplus espscm )
-install ( TARGETS dfuplus DESTINATION ${OSSDIR}/bin )
+install ( TARGETS dfuplus RUNTIME DESTINATION ${EXEC_DIR} )
 target_link_libraries ( dfuplus
          jlib
          remote
          xmllib
          esphttp
-         ws_fs
-         ws_dfu
     )
 
 

dali/dfuxref/CMakeLists.txt

@@ -45,7 +45,7 @@ include_directories (
 ADD_DEFINITIONS ( -D_CONSOLE -DMAIN_DFUXREF )
 
 HPCC_ADD_EXECUTABLE ( dfuxref ${SRCS} )
-install ( TARGETS dfuxref DESTINATION ${OSSDIR}/bin )
+install ( TARGETS dfuxref RUNTIME DESTINATION ${EXEC_DIR} )
 target_link_libraries ( dfuxref 
          jlib
          mp 

dali/ft/dalift.cmake

@@ -50,7 +50,7 @@ set_target_properties (dalift PROPERTIES
     COMPILE_FLAGS -D_CONSOLE
     DEFINE_SYMBOL DALIFT_EXPORTS
     )
-install ( TARGETS dalift DESTINATION ${OSSDIR}/lib )
+install ( TARGETS dalift RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
 target_link_libraries ( dalift 
          jlib
          mp 

dali/ft/ftslave.cmake

@@ -39,7 +39,7 @@ include_directories (
 
 HPCC_ADD_EXECUTABLE ( ftslave ${SRCS} )
 set_target_properties (ftslave PROPERTIES COMPILE_FLAGS -D_CONSOLE)
-install ( TARGETS ftslave DESTINATION ${OSSDIR}/bin )
+install ( TARGETS ftslave RUNTIME DESTINATION ${EXEC_DIR} )
 target_link_libraries ( ftslave
          jlib
          mp 

dali/hellodali/CMakeLists.txt

@@ -42,7 +42,7 @@ include_directories (
 ADD_DEFINITIONS( -D_CONSOLE )
 
 HPCC_ADD_EXECUTABLE ( hellodali ${SRCS} )
-install ( TARGETS hellodali DESTINATION ${OSSDIR}/bin )
+install ( TARGETS hellodali RUNTIME DESTINATION ${EXEC_DIR} )
 target_link_libraries ( hellodali
          jlib
          mp 

dali/regress/CMakeLists.txt

@@ -43,7 +43,7 @@ include_directories (
 ADD_DEFINITIONS( -D_CONSOLE )
 
 HPCC_ADD_EXECUTABLE ( daregress ${SRCS} )
-install ( TARGETS daregress DESTINATION ${OSSDIR}/bin )
+install ( TARGETS daregress RUNTIME DESTINATION ${EXEC_DIR} )
 target_link_libraries ( daregress  
          jlib
          mp 

dali/sasha/CMakeLists.txt

@@ -69,7 +69,7 @@ if (WIN32)
 endif()
 
 HPCC_ADD_EXECUTABLE ( saserver ${SRCS} )
-install ( TARGETS saserver DESTINATION ${OSSDIR}/bin)
+install ( TARGETS saserver RUNTIME DESTINATION ${EXEC_DIR})
 
 
 if ( ${HAVE_LIBCRYPT} )
@@ -104,7 +104,7 @@ include_directories (
 ADD_DEFINITIONS ( -D_CONSOLE )
 
 HPCC_ADD_EXECUTABLE ( sasha ${SRCS} )
-install ( TARGETS sasha DESTINATION ${OSSDIR}/bin)
+install ( TARGETS sasha RUNTIME DESTINATION ${EXEC_DIR})
 
 target_link_libraries ( sasha 
          ${XALAN_LIBRARIES} ${XERCES_LIBRARIES}

dali/server/CMakeLists.txt

@@ -54,7 +54,7 @@ if (WIN32)
 endif()
 
 HPCC_ADD_EXECUTABLE ( daserver ${SRCS} )
-install ( TARGETS daserver DESTINATION ${OSSDIR}/bin)
+install ( TARGETS daserver RUNTIME DESTINATION ${EXEC_DIR})
 target_link_libraries ( daserver 
          jlib
          mp 

dali/treeview/CMakeLists.txt

@@ -46,7 +46,7 @@ if (WIN32)
 
     add_definitions("-D_AFXDLL")
     HPCC_ADD_EXECUTABLE ( treeview WIN32 ${SRCS} )
-    install ( TARGETS treeview DESTINATION ${OSSDIR}/bin )
+    install ( TARGETS treeview RUNTIME DESTINATION ${EXEC_DIR} )
     target_link_libraries ( treeview
              jlib
              mp 

dali/updtdalienv/CMakeLists.txt

@@ -43,7 +43,7 @@ include_directories (
 ADD_DEFINITIONS( -D_CONSOLE )
 
 HPCC_ADD_EXECUTABLE ( updtdalienv ${SRCS} )
-install ( TARGETS updtdalienv DESTINATION ${OSSDIR}/bin )
+install ( TARGETS updtdalienv RUNTIME DESTINATION ${EXEC_DIR} )
 target_link_libraries ( updtdalienv  
          jlib
          mp 

deploy/CMakeLists.txt

@@ -16,4 +16,8 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
-add_subdirectory (gcc3)
+if ( UNIX )
+  add_subdirectory (gcc3)
+elseif ( WIN32 )
+  add_subdirectory (vc2008)
+endif ()

deploy/gcc3/bin/CMakeLists.txt

@@ -16,4 +16,4 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
-Install ( PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/g++ DESTINATION ${OSSDIR}/componentfiles/cl/bin COMPONENT Runtime )
+Install ( PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/g++ DESTINATION componentfiles/cl/bin COMPONENT Runtime )

deploy/vc2008/CMakeLists.txt

@@ -0,0 +1,19 @@
+################################################################################
+#    Copyright (C) 2011 HPCC Systems.
+#
+#    This program is free software: you can redistribute it and/or All rights
+#    reserved. This program is NOT PRESENTLY free software: you can NOT
+#    redistribute
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+add_subdirectory (bin)

deploy/vc2008/bin/CMakeLists.txt

@@ -0,0 +1,20 @@
+################################################################################
+#    Copyright (C) 2011 HPCC Systems.
+#
+#    This program is free software: you can redistribute it and/or All rights
+#    reserved. This program is NOT PRESENTLY free software: you can NOT
+#    redistribute
+#    it under the terms of the GNU Affero General Public License as
+#    published by the Free Software Foundation, either version 3 of the
+#    License, or (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Affero General Public License for more details.
+#
+#    You should have received a copy of the GNU Affero General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+################################################################################
+Install ( PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/cl.bat DESTINATION componentfiles/cl/bin COMPONENT Runtime )
+Install ( PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/link.bat DESTINATION componentfiles/cl/bin COMPONENT Runtime )

deployment/CMakeLists.txt

@@ -16,7 +16,7 @@
 #    You should have received a copy of the GNU Affero General Public License
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
-HPCC_ADD_SUBDIRECTORY (configgen)
-HPCC_ADD_SUBDIRECTORY (deploy)
+HPCC_ADD_SUBDIRECTORY (configgen "PLATFORM")
+HPCC_ADD_SUBDIRECTORY (deploy "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (deployutils "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (envgen "PLATFORM")

deployment/configgen/CMakeLists.txt

@@ -41,7 +41,7 @@ include_directories (
 ADD_DEFINITIONS ( -D_CONSOLE )
 
 HPCC_ADD_EXECUTABLE ( configgen ${SRCS} )
-install ( TARGETS configgen DESTINATION ${OSSDIR}/sbin )
+install ( TARGETS configgen DESTINATION sbin )
 target_link_libraries ( configgen 
         deploy 
         jlib 

deployment/deploy/CMakeLists.txt

@@ -56,7 +56,7 @@ include_directories (
 ADD_DEFINITIONS ( -D_USRDLL -DDEPLOY_EXPORTS )
 
 HPCC_ADD_LIBRARY( deploy SHARED ${SRCS} )
-install ( TARGETS deploy DESTINATION ${OSSDIR}/lib )
+install ( TARGETS deploy RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
 target_link_libraries ( deploy 
          jlib 
          environment 
@@ -65,5 +65,5 @@ target_link_libraries ( deploy
     )
 
 if ( PLATFORM )
-    install ( PROGRAMS configesp.install DESTINATION ${DIR_NAME}/etc/init.d/install COMPONENT Runtime )
+    install ( PROGRAMS configesp.install DESTINATION etc/init.d/install COMPONENT Runtime )
 endif()

deployment/deployutils/CMakeLists.txt

@@ -50,7 +50,7 @@ include_directories (
 ADD_DEFINITIONS ( -D_USRDLL -DDEPLOYUTILS_EXPORTS )
 
 HPCC_ADD_LIBRARY( deployutils SHARED ${SRCS} )
-install ( TARGETS deployutils DESTINATION ${OSSDIR}/lib )
+install ( TARGETS deployutils RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
 target_link_libraries ( deployutils
          jlib 
          environment 

deployment/envgen/CMakeLists.txt

@@ -43,7 +43,7 @@ include_directories (
 ADD_DEFINITIONS ( -D_CONSOLE )
 
 HPCC_ADD_EXECUTABLE ( envgen ${SRCS} )
-install ( TARGETS envgen DESTINATION ${OSSDIR}/sbin )
+install ( TARGETS envgen DESTINATION sbin )
 target_link_libraries ( envgen 
         deploy
         deployutils 

ecl/CMakeLists.txt

@@ -26,7 +26,7 @@ HPCC_ADD_SUBDIRECTORY (eclplus "CLIENTTOOLS")
 HPCC_ADD_SUBDIRECTORY (ecl-package "CLIENTTOOLS")
 HPCC_ADD_SUBDIRECTORY (hql)
 HPCC_ADD_SUBDIRECTORY (hqlcpp)
-HPCC_ADD_SUBDIRECTORY (hthor "PLATFORM")
+HPCC_ADD_SUBDIRECTORY (hthor)
 HPCC_ADD_SUBDIRECTORY (scheduleadmin "PLATFORM")
-HPCC_ADD_SUBDIRECTORY (schedulectrl "PLATFORM")
+HPCC_ADD_SUBDIRECTORY (schedulectrl)
 HPCC_ADD_SUBDIRECTORY (wutest "PLATFORM")

ecl/agentexec/CMakeLists.txt

@@ -43,7 +43,7 @@ include_directories (
 ADD_DEFINITIONS( -D_CONSOLE )
 
 HPCC_ADD_EXECUTABLE ( agentexec ${SRCS} )
-install ( TARGETS agentexec DESTINATION ${OSSDIR}/bin )
+install ( TARGETS agentexec RUNTIME DESTINATION ${EXEC_DIR} )
 target_link_libraries ( agentexec
          jlib 
          dalibase 

ecl/agentexec/agentexec.cmake

@@ -45,7 +45,7 @@ include_directories (
 ADD_DEFINITIONS ( -D_CONSOLE )
 
 HPCC_ADD_EXECUTABLE ( agentexec ${SRCS} )
-install ( TARGETS agentexec DESTINATION ${OSSDIR}/bin )
+install ( TARGETS agentexec RUNTIME DESTINATION ${EXEC_DIR} )
 
 target_link_libraries ( agentexec
          jlib 

ecl/ecl-package/CMakeLists.txt

@@ -44,12 +44,14 @@ ADD_DEFINITIONS( -D_CONSOLE )
 
 HPCC_ADD_EXECUTABLE ( ecl-package ${SRCS} )
 add_dependencies ( ecl-package espscm ws_packageprocess )
-install ( TARGETS ecl-package DESTINATION ${OSSDIR}/bin )
+install ( TARGETS ecl-package RUNTIME DESTINATION ${EXEC_DIR} )
 target_link_libraries ( ecl-package
         jlib
         esphttp
         workunit
     )
 
-install ( PROGRAMS ecl-package.install DESTINATION ${OSSDIR}/etc/init.d/install COMPONENT Runtime )
+if ( UNIX )
+install ( PROGRAMS ecl-package.install DESTINATION etc/init.d/install COMPONENT Runtime )
+endif ( UNIX )
 

ecl/eclagent/CMakeLists.txt

@@ -42,10 +42,10 @@ include_directories (
 ADD_DEFINITIONS( -DNO_SYBASE -D_CONSOLE )
 
 HPCC_ADD_EXECUTABLE ( eclagent ${SRCS} )
-install ( TARGETS eclagent DESTINATION ${OSSDIR}/bin )
+install ( TARGETS eclagent RUNTIME DESTINATION ${EXEC_DIR} )
 target_link_libraries ( eclagent
       hthor           
       ${CPPUNIT_LIBRARIES}
     )
 
-Install ( PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/start_eclagent DESTINATION ${OSSDIR}/bin COMPONENT Runtime )
+Install ( PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/start_eclagent DESTINATION ${EXEC_DIR} COMPONENT Runtime )

ecl/eclcc/CMakeLists.txt

@@ -52,7 +52,7 @@ if (WIN32)
 endif()
 
 HPCC_ADD_EXECUTABLE ( eclcc ${SRCS} )
-install ( TARGETS eclcc DESTINATION ${OSSDIR}/bin )
+install ( TARGETS eclcc RUNTIME DESTINATION ${EXEC_DIR} )
 target_link_libraries ( eclcc 
          jlib
          nbcd 

ecl/eclcc/eclcc.cpp

@@ -42,10 +42,6 @@
 #include "build-config.h"
 #include "rmtfile.hpp"
 
-#if defined (__APPLE__)
-#include <mach-o/dyld.h>
-#endif
-
 #define INIFILE "eclcc.ini"
 #define SYSTEMCONFDIR CONFIG_DIR
 #define DEFAULTINIFILE "eclcc.ini"
@@ -140,6 +136,24 @@ static bool extractOption(StringAttr & option, IProperties * globals, const char
     return ret;
 }
 
+static bool getPackageFolder(StringBuffer & path)
+{
+    StringBuffer folder;
+    splitDirTail(queryCurrentProcessPath(), folder);
+    removeTrailingPathSepChar(folder);
+    if (folder.length())
+    {
+        StringBuffer foldersFolder;
+        splitDirTail(folder.str(), foldersFolder);
+        if (foldersFolder.length())
+        {
+            path = foldersFolder;
+            return true;
+        }
+    }
+    return false;
+}
+
 struct EclCompileInstance
 {
 public:
@@ -390,59 +404,25 @@ void EclCC::loadOptions()
     globals.setown(createProperties(optIniFilename, true));
 
     StringBuffer compilerPath, includePath, libraryPath;
-    
+
     if (globals->hasProp("targetGcc"))
         optTargetCompiler = globals->getPropBool("targetGcc") ? GccCppCompiler : Vs6CppCompiler;
 
-#if _WIN32
     StringBuffer syspath;
-    HMODULE hModule = GetModuleHandle(NULL);
-    char path[MAX_PATH];
-    GetModuleFileName(hModule, path, MAX_PATH);
-    splitFilename(path, &syspath, &syspath, NULL, NULL);
-    syspath.append(PATHSEPCHAR);
-    extractOption(compilerPath, globals, "CL_PATH", "compilerPath", syspath, ".\\cl");
-    extractOption(libraryPath, globals, "ECLCC_LIBRARY_PATH", "libraryPath", syspath, ".\\cl\\lib");
-    extractOption(includePath, globals, "ECLCC_INCLUDE_PATH", "includePath", syspath, ".\\cl\\include");
-    extractOption(pluginsPath, globals, "ECLCC_PLUGIN_PATH", "plugins", syspath, ".\\plugins");
-    extractOption(hooksPath, globals, "HPCC_FILEHOOKS_PATH", "filehooks", syspath, ".\\filehooks");
-    extractOption(templatePath, globals, "ECLCC_TPL_PATH", "templatePath", syspath, ".");
-    extractOption(eclLibraryPath, globals, "ECLCC_ECLLIBRARY_PATH", "eclLibrariesPath", syspath, ".\\ecllibrary");
+    if (getPackageFolder(syspath))
+    {
+#if _WIN32
+        extractOption(compilerPath, globals, "CL_PATH", "compilerPath", syspath, "componentfiles\\cl");
 #else
-    StringBuffer syspath;
-    #if defined (__APPLE__)
-        char path[PATH_MAX]; 
-        uint32_t size = sizeof(path); 
-        _NSGetExecutablePath(path, &size);
-
-        splitFilename(path, &syspath, &syspath, NULL, NULL);
-        //  Remove trailing folder (typically "/bin/")
-        removeTrailingPathSepChar(syspath);
-        for (int i = syspath.length() - 1; i >= 0; --i)
-        {
-            if (isPathSepChar(syspath.charAt(i)))
-            {
-                syspath.setLength(i + 1);
-                break;
-            }
-        }
-    #else
-        StringBuffer fn(SYSTEMCONFDIR);
-        fn.append(PATHSEPSTR).append(SYSTEMCONFFILE);
-        Owned<IProperties> sysconf = createProperties(fn, true);
-
-        sysconf->getProp("path", syspath);
-        syspath.append(PATHSEPCHAR);
-    #endif
-    extractOption(compilerPath, globals, "CL_PATH", "compilerPath", "/usr", NULL);
-    extractOption(libraryPath, globals, "ECLCC_LIBRARY_PATH", "libraryPath", syspath, "lib");
-    extractOption(includePath, globals, "ECLCC_INCLUDE_PATH", "includePath", syspath, "componentfiles/cl/include");
-    extractOption(pluginsPath, globals, "ECLCC_PLUGIN_PATH", "plugins", syspath, "plugins");
-    extractOption(hooksPath, globals, "HPCC_FILEHOOKS_PATH", "filehooks", syspath, "filehooks");
-    extractOption(templatePath, globals, "ECLCC_TPL_PATH", "templatePath", syspath, "componentfiles");
-    extractOption(eclLibraryPath, globals, "ECLCC_ECLLIBRARY_PATH", "eclLibrariesPath", syspath, "share/ecllibrary/");
+        extractOption(compilerPath, globals, "CL_PATH", "compilerPath", "/usr", NULL);
 #endif
-
+        extractOption(libraryPath, globals, "ECLCC_LIBRARY_PATH", "libraryPath", syspath, "lib");
+        extractOption(includePath, globals, "ECLCC_INCLUDE_PATH", "includePath", syspath, "componentfiles/cl/include");
+        extractOption(pluginsPath, globals, "ECLCC_PLUGIN_PATH", "plugins", syspath, "plugins");
+        extractOption(hooksPath, globals, "HPCC_FILEHOOKS_PATH", "filehooks", syspath, "filehooks");
+        extractOption(templatePath, globals, "ECLCC_TPL_PATH", "templatePath", syspath, "componentfiles");
+        extractOption(eclLibraryPath, globals, "ECLCC_ECLLIBRARY_PATH", "eclLibrariesPath", syspath, "share/ecllibrary/");
+    }
     extractOption(stdIncludeLibraryPath, globals, "ECLCC_ECLINCLUDE_PATH", "eclIncludePath", ".", NULL);
 
     if (!optLogfile.length() && !optBatchMode)

ecl/eclccserver/CMakeLists.txt

@@ -46,7 +46,7 @@ include_directories (
     )
 
 HPCC_ADD_EXECUTABLE ( eclccserver ${SRCS} ${INCLUDES} )
-install ( TARGETS eclccserver DESTINATION ${OSSDIR}/bin )
+install ( TARGETS eclccserver RUNTIME DESTINATION ${EXEC_DIR} )
 
 target_link_libraries ( eclccserver 
          jlib

ecl/eclcmd/CMakeLists.txt

@@ -68,7 +68,7 @@ ADD_DEFINITIONS( -D_CONSOLE )
 
 HPCC_ADD_EXECUTABLE ( ecl ${SRCS} )
 add_dependencies ( ecl espscm workunit ws_workunits )
-install ( TARGETS ecl DESTINATION ${OSSDIR}/bin )
+install ( TARGETS ecl RUNTIME DESTINATION ${EXEC_DIR} )
 target_link_libraries ( ecl
         jlib
         esphttp

ecl/eclcmd/queries/CMakeLists.txt

@@ -44,11 +44,13 @@ ADD_DEFINITIONS( -D_CONSOLE )
 
 HPCC_ADD_EXECUTABLE ( ecl-queries ${SRCS} )
 add_dependencies ( ecl-queries espscm ws_workunits )
-install ( TARGETS ecl-queries DESTINATION ${OSSDIR}/bin )
+install ( TARGETS ecl-queries RUNTIME DESTINATION ${EXEC_DIR} )
 target_link_libraries ( ecl-queries
         jlib
         esphttp
         workunit
     )
 
-install ( PROGRAMS ecl-queries.install DESTINATION ${OSSDIR}/etc/init.d/install COMPONENT Runtime )
+if (UNIX)
+install ( PROGRAMS ecl-queries.install DESTINATION etc/init.d/install COMPONENT Runtime )
+endif (UNIX)

ecl/eclplus/CMakeLists.txt

@@ -63,7 +63,7 @@ ADD_DEFINITIONS( -DECLPLUS_EXPORTS -D_CONSOLE )
 
 HPCC_ADD_EXECUTABLE ( eclplus ${SRCS} )
 add_dependencies ( eclplus espscm )
-install ( TARGETS eclplus DESTINATION ${OSSDIR}/bin )
+install ( TARGETS eclplus RUNTIME DESTINATION ${EXEC_DIR} )
 target_link_libraries (  eclplus 
          jlib
          esphttp 

ecl/eclscheduler/CMakeLists.txt

@@ -45,7 +45,7 @@ include_directories (
     )
 
 HPCC_ADD_EXECUTABLE ( eclscheduler ${SRCS} ${INCLUDES} )
-install ( TARGETS eclscheduler DESTINATION ${OSSDIR}/bin )
+install ( TARGETS eclscheduler RUNTIME DESTINATION ${EXEC_DIR} )
 
 target_link_libraries ( eclscheduler 
          jlib

ecl/hql/CMakeLists.txt

@@ -131,7 +131,7 @@ endif()
 ADD_DEFINITIONS( -D_USRDLL -DHQL_EXPORTS -DHQLFOLD_EXPORTS -DHQLTRANS_EXPORTS )
 
 HPCC_ADD_LIBRARY( hql SHARED ${SRCS} ${CMAKE_CURRENT_BINARY_DIR}/hqlgram.cpp ${CMAKE_CURRENT_BINARY_DIR}/hqllex.cpp  )
-install ( TARGETS hql DESTINATION ${OSSDIR}/lib )
+install ( TARGETS hql RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
 target_link_libraries ( hql  
          jlib
          nbcd 

ecl/hqlcpp/CMakeLists.txt

@@ -125,7 +125,7 @@ ENDIF()
 ADD_DEFINITIONS( -DHQLCPP_EXPORTS -D_USRDLL )
 
 HPCC_ADD_LIBRARY( hqlcpp SHARED ${SRCS} )
-install ( TARGETS hqlcpp DESTINATION ${OSSDIR}/lib )
+install ( TARGETS hqlcpp RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
 target_link_libraries ( hqlcpp
          jlib
          nbcd 

ecl/hthor/CMakeLists.txt

@@ -74,7 +74,7 @@ include_directories (
 ADD_DEFINITIONS( -D_USRDLL -DHTHOR_EXPORTS -DSTARTQUERY_EXPORTS )
 
 HPCC_ADD_LIBRARY( hthor SHARED ${SRCS} ${INCLUDES} )
-install ( TARGETS hthor DESTINATION ${OSSDIR}/lib )
+install ( TARGETS hthor RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} ARCHIVE DESTINATION ${ARCHIVE_DIR} )
 target_link_libraries ( hthor
          jlib
          mp

ecl/scheduleadmin/CMakeLists.txt

@@ -42,7 +42,7 @@ include_directories (
 ADD_DEFINITIONS( -DNO_SYBASE -D_CONSOLE )
 
 HPCC_ADD_EXECUTABLE ( scheduleadmin ${SRCS} )
-install ( TARGETS scheduleadmin DESTINATION ${OSSDIR}/bin )
+install ( TARGETS scheduleadmin RUNTIME DESTINATION ${EXEC_DIR} )
 target_link_libraries ( scheduleadmin 
          jlib
          remote 

ecl/schedulectrl/CMakeLists.txt

@@ -45,7 +45,7 @@ include_directories (
 ADD_DEFINITIONS( -D_USRDLL -DSCHEDULECTRL_EXPORTS )
 
 HPCC_ADD_LIBRARY( schedulectrl SHARED ${SRCS} )
-install ( TARGETS schedulectrl DESTINATION ${OSSDIR}/lib )
+install ( TARGETS schedulectrl RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
 target_link_libraries ( schedulectrl
          jlib
          remote 

ecllibrary/CMakeLists.txt

@@ -17,6 +17,6 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/StyleGuide.html DESTINATION ${OSSDIR}/share/ecllibrary COMPONENT Runtime )
-Install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/std DESTINATION ${OSSDIR}/share/ecllibrary COMPONENT Runtime USE_SOURCE_PERMISSIONS PATTERN ".svn" EXCLUDE )
-Install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/teststd DESTINATION ${OSSDIR}/share/ecllibrary COMPONENT Runtime USE_SOURCE_PERMISSIONS PATTERN ".svn" EXCLUDE )
+Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/StyleGuide.html DESTINATION share/ecllibrary COMPONENT Runtime )
+Install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/std DESTINATION share/ecllibrary COMPONENT Runtime USE_SOURCE_PERMISSIONS PATTERN ".svn" EXCLUDE )
+Install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/teststd DESTINATION share/ecllibrary COMPONENT Runtime USE_SOURCE_PERMISSIONS PATTERN ".svn" EXCLUDE )

esp/CMakeLists.txt

@@ -23,8 +23,8 @@ HPCC_ADD_SUBDIRECTORY (files "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (platform "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (protocols)
 HPCC_ADD_SUBDIRECTORY (scm)
-HPCC_ADD_SUBDIRECTORY (services)
-HPCC_ADD_SUBDIRECTORY (smc)
+HPCC_ADD_SUBDIRECTORY (services "PLATFORM")
+HPCC_ADD_SUBDIRECTORY (smc "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (test "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (tools "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (xslt "PLATFORM")

esp/bindings/SOAP/soaplib/CMakeLists.txt

@@ -70,7 +70,7 @@ if (WIN32)
         )
 else (WIN32)
     HPCC_ADD_LIBRARY( soaplib SHARED ${SRCS} )
-    install ( TARGETS soaplib DESTINATION ${OSSDIR}/lib )
+    install ( TARGETS soaplib RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
     target_link_libraries (soaplib 
         jlib
         )

esp/clients/LoggingClient/CMakeLists.txt

@@ -59,7 +59,7 @@ endif (RELEASE_BUILD EQUAL 1)
 
 HPCC_ADD_LIBRARY( loggingclient SHARED ${SRCS} )
 add_dependencies( loggingclient espscm )
-install ( TARGETS loggingclient DESTINATION ${OSSDIR}/lib )
+install ( TARGETS loggingclient RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
 target_link_libraries ( loggingclient
          ${XALAN_LIBRARIES} ${XERCES_LIBRARIES}
          jlib

esp/clients/WUManager/CMakeLists.txt

@@ -48,7 +48,7 @@ ADD_DEFINITIONS( -D_CONSOLE )
 
 HPCC_ADD_EXECUTABLE ( wumanager ${SRCS} )
 add_dependencies ( wumanager espscm )
-#install ( TARGETS wumanager DESTINATION ${OSSDIR}/bin ) # do not install - this is an example program
+#install ( TARGETS wumanager RUNTIME DESTINATION ${EXEC_DIR} ) # do not install - this is an example program
 
 target_link_libraries ( wumanager 
          ${XALAN_LIBRARIES} ${XERCES_LIBRARIES}

esp/clients/wsecl/CMakeLists.txt

@@ -50,7 +50,7 @@ include_directories (
 ADD_DEFINITIONS( -D_USRDLL -DWS_ECL_CLIENT_EXPORTS )
 
 HPCC_ADD_LIBRARY( ws_ecl_client SHARED ${SRCS} )
-install ( TARGETS ws_ecl_client DESTINATION ${OSSDIR}/lib )
+install ( TARGETS ws_ecl_client RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
 target_link_libraries (  ws_ecl_client 
          ${XALAN_LIBRARIES} ${XERCES_LIBRARIES}
          jlib

esp/eclwatch/ws_XSLT/CMakeLists.txt

@@ -21,7 +21,7 @@ FOREACH ( iFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/exceptions.xslt
     ${CMAKE_CURRENT_SOURCE_DIR}/BoolResponse.xslt
 )
-    Install ( FILES ${iFILES} DESTINATION ${OSSDIR}/componentfiles/xslt COMPONENT Runtime )
+    Install ( FILES ${iFILES} DESTINATION componentfiles/xslt COMPONENT Runtime )
 ENDFOREACH ( iFILES )
 
 FOREACH ( iFILES
@@ -173,7 +173,7 @@ FOREACH ( iFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/account_input.xslt
     ${CMAKE_CURRENT_SOURCE_DIR}/account_myaccount.xslt
 )
-    Install ( FILES ${iFILES} DESTINATION ${OSSDIR}/componentfiles/smc_xslt COMPONENT Runtime )
+    Install ( FILES ${iFILES} DESTINATION componentfiles/smc_xslt COMPONENT Runtime )
 ENDFOREACH ( iFILES )
 
 FOREACH ( iFILES
@@ -181,5 +181,5 @@ FOREACH ( iFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/result_lib.xslt
     ${CMAKE_CURRENT_SOURCE_DIR}/lib.xslt
 )
-    Install ( FILES ${iFILES} DESTINATION ${OSSDIR}/componentfiles/wsecl/wsecl COMPONENT Runtime )
+    Install ( FILES ${iFILES} DESTINATION componentfiles/wsecl/wsecl COMPONENT Runtime )
 ENDFOREACH ( iFILES )

esp/files/CMakeLists.txt

@@ -57,18 +57,18 @@ FOREACH( iFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/ECLPlayground.css
     ${CMAKE_CURRENT_SOURCE_DIR}/ECLPlayground.js
 )
-    Install( FILES ${iFILES} DESTINATION ${OSSDIR}/componentfiles/files COMPONENT Runtime )
+    Install( FILES ${iFILES} DESTINATION componentfiles/files COMPONENT Runtime )
 ENDFOREACH ( iFILES )
 
-Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/popup.js DESTINATION ${OSSDIR}/componentfiles/files/scripts COMPONENT Runtime )
+Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/popup.js DESTINATION componentfiles/files/scripts COMPONENT Runtime )
 
-Install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/yui DESTINATION ${OSSDIR}/componentfiles/files COMPONENT Runtime USE_SOURCE_PERMISSIONS PATTERN ".svn" EXCLUDE )
+Install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/yui DESTINATION componentfiles/files COMPONENT Runtime USE_SOURCE_PERMISSIONS PATTERN ".svn" EXCLUDE )
 
-Install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dojo DESTINATION ${OSSDIR}/componentfiles/files COMPONENT Runtime USE_SOURCE_PERMISSIONS PATTERN ".svn" EXCLUDE )
-Install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dojox DESTINATION ${OSSDIR}/componentfiles/files COMPONENT Runtime USE_SOURCE_PERMISSIONS PATTERN ".svn" EXCLUDE )
-Install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dijit DESTINATION ${OSSDIR}/componentfiles/files COMPONENT Runtime USE_SOURCE_PERMISSIONS PATTERN ".svn" EXCLUDE )
-Install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/CodeMirror2 DESTINATION ${OSSDIR}/componentfiles/files COMPONENT Runtime USE_SOURCE_PERMISSIONS PATTERN ".svn" EXCLUDE )
-Install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ecl DESTINATION ${OSSDIR}/componentfiles/files COMPONENT Runtime USE_SOURCE_PERMISSIONS PATTERN ".svn" EXCLUDE )
+Install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dojo DESTINATION componentfiles/files COMPONENT Runtime USE_SOURCE_PERMISSIONS PATTERN ".svn" EXCLUDE )
+Install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dojox DESTINATION componentfiles/files COMPONENT Runtime USE_SOURCE_PERMISSIONS PATTERN ".svn" EXCLUDE )
+Install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dijit DESTINATION componentfiles/files COMPONENT Runtime USE_SOURCE_PERMISSIONS PATTERN ".svn" EXCLUDE )
+Install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/CodeMirror2 DESTINATION componentfiles/files COMPONENT Runtime USE_SOURCE_PERMISSIONS PATTERN ".svn" EXCLUDE )
+Install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ecl DESTINATION componentfiles/files COMPONENT Runtime USE_SOURCE_PERMISSIONS PATTERN ".svn" EXCLUDE )
 
 add_subdirectory (css)
 add_subdirectory (html)

esp/files/css/CMakeLists.txt

@@ -29,5 +29,5 @@ FOREACH( iFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/tabs.css
     ${CMAKE_CURRENT_SOURCE_DIR}/ecl.css
 )
-    Install( FILES ${iFILES} DESTINATION ${OSSDIR}/componentfiles/files/css COMPONENT Runtime )
+    Install( FILES ${iFILES} DESTINATION componentfiles/files/css COMPONENT Runtime )
 ENDFOREACH ( iFILES )

esp/files/html/CMakeLists.txt

@@ -17,4 +17,4 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/searchfile.html DESTINATION ${OSSDIR}/componentfiles/files COMPONENT Runtime )
+Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/searchfile.html DESTINATION componentfiles/files COMPONENT Runtime )

esp/files/img/CMakeLists.txt

@@ -91,7 +91,7 @@ FOREACH( iFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/bullet_yellow.png
     ${CMAKE_CURRENT_SOURCE_DIR}/loadingAnimation.gif
 )
-    Install ( FILES ${iFILES} DESTINATION ${OSSDIR}/componentfiles/files/img COMPONENT Runtime)
+    Install ( FILES ${iFILES} DESTINATION componentfiles/files/img COMPONENT Runtime)
 ENDFOREACH( iFILES )
 
-Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/favlogo.png DESTINATION ${OSSDIR}/componentfiles/files COMPONENT Runtime )
+Install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/favlogo.png DESTINATION componentfiles/files COMPONENT Runtime )

esp/files/logo/CMakeLists.txt

@@ -22,5 +22,5 @@ FOREACH( iFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/seisint_small.gif
     ${CMAKE_CURRENT_SOURCE_DIR}/slogo.gif
 )
-    Install( FILES ${iFILES} DESTINATION ${OSSDIR}/componentfiles/files/logo COMPONENT Runtime )
+    Install( FILES ${iFILES} DESTINATION componentfiles/files/logo COMPONENT Runtime )
 ENDFOREACH ( iFILES )

esp/files/scripts/CMakeLists.txt

@@ -52,5 +52,5 @@ FOREACH( iFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/ResultsControl.js
     ${CMAKE_CURRENT_SOURCE_DIR}/SampleSelectControl.js
 )
-    Install ( FILES ${iFILES} DESTINATION ${OSSDIR}/componentfiles/files/scripts COMPONENT Runtime )
+    Install ( FILES ${iFILES} DESTINATION componentfiles/files/scripts COMPONENT Runtime )
 ENDFOREACH ( iFILES )

esp/files/scripts/configmgr/CMakeLists.txt

@@ -22,5 +22,5 @@ FOREACH( iFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/configmgr.js
     ${CMAKE_CURRENT_SOURCE_DIR}/navtree.js
 )
-    Install ( FILES ${iFILES} DESTINATION ${OSSDIR}/componentfiles/files/scripts/configmgr COMPONENT Runtime)
+    Install ( FILES ${iFILES} DESTINATION componentfiles/files/scripts/configmgr COMPONENT Runtime)
 ENDFOREACH( iFILES )

esp/platform/CMakeLists.txt

@@ -50,7 +50,7 @@ include_directories (
 ADD_DEFINITIONS( -D_CONSOLE )
 
 HPCC_ADD_EXECUTABLE ( esp ${SRCS} )
-install ( TARGETS esp DESTINATION ${OSSDIR}/bin )
+install ( TARGETS esp RUNTIME DESTINATION ${EXEC_DIR} )
 target_link_libraries ( esp 
          jlib
          mp 

esp/protocols/http/CMakeLists.txt

@@ -67,7 +67,7 @@ ADD_DEFINITIONS( -DESPHTTP_EXPORTS -DESP_TIMING -D_USRDLL -DESP_PLUGIN )
 
 HPCC_ADD_LIBRARY( esphttp SHARED ${SRCS} )
 add_dependencies (esphttp  espscm )
-install ( TARGETS esphttp DESTINATION ${OSSDIR}/lib )
+install ( TARGETS esphttp RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
 target_link_libraries ( esphttp 
          ${XALAN_LIBRARIES} ${XERCES_LIBRARIES}
          jlib

esp/scm/espscm.cmake

@@ -66,7 +66,9 @@ foreach ( loop_var ${ESPSCM_SRCS} )
     set_source_files_properties(${ESPSCM_GENERATED_DIR}/${result}_esp.ipp PROPERTIES GENERATED TRUE)
     set_source_files_properties(${ESPSCM_GENERATED_DIR}/${result}.xml PROPERTIES GENERATED TRUE)
     set ( ESP_GENERATED_INCLUDES ${ESP_GENERATED_INCLUDES} ${ESPSCM_GENERATED_DIR}/${result}.esp ${ESPSCM_GENERATED_DIR}/${result}.hpp ${ESPSCM_GENERATED_DIR}/${result}.int ${ESPSCM_GENERATED_DIR}/${result}.ipp ${ESPSCM_GENERATED_DIR}/${result}_esp.ipp ${ESPSCM_GENERATED_DIR}/${result}.xml )
-    Install( FILES ${ESPSCM_GENERATED_DIR}/${result}.xml DESTINATION ${OSSDIR}/componentfiles/esdl_files COMPONENT Runtime )
+    if ( PLATFORM )    
+        Install( FILES ${ESPSCM_GENERATED_DIR}/${result}.xml DESTINATION componentfiles/esdl_files COMPONENT Runtime )
+    endif ( PLATFORM )    
 endforeach ( loop_var ${ESPSCM_SRCS} )
 
 include_directories ( ${ESPSCM_GENERATED_DIR} )

esp/services/CMakeLists.txt

@@ -22,10 +22,10 @@ IF (USE_OPENLDAP)
 ENDIF(USE_OPENLDAP)
 HPCC_ADD_SUBDIRECTORY (ws_account "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (ws_config "PLATFORM")
-HPCC_ADD_SUBDIRECTORY (ws_dfu)
+HPCC_ADD_SUBDIRECTORY (ws_dfu "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (ws_ecl "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (ws_fileio "PLATFORM")
-HPCC_ADD_SUBDIRECTORY (ws_fs)
+HPCC_ADD_SUBDIRECTORY (ws_fs "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (ws_machine "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (ws_roxiequery "PLATFORM")
 HPCC_ADD_SUBDIRECTORY (ws_smc "PLATFORM")

esp/services/WsDeploy/CMakeLists.txt

@@ -65,7 +65,7 @@ ADD_DEFINITIONS( -D_USRDLL )
 
 HPCC_ADD_LIBRARY( WsDeploy SHARED ${SRCS}  )
 add_dependencies (WsDeploy espscm)
-install ( TARGETS WsDeploy DESTINATION ${OSSDIR}/lib )
+install ( TARGETS WsDeploy RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
 target_link_libraries ( WsDeploy  
          jlib
          xmllib 

esp/services/ecldirect/CMakeLists.txt

@@ -57,7 +57,7 @@ ADD_DEFINITIONS( -D_USRDLL )
 
 HPCC_ADD_LIBRARY( EclDirect SHARED ${SRCS} )
 add_dependencies( EclDirect espscm )
-install ( TARGETS EclDirect DESTINATION ${OSSDIR}/lib COMPONENT Runtime)
+install ( TARGETS EclDirect RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} COMPONENT Runtime)
 target_link_libraries ( EclDirect  
          jlib
          xmllib 

esp/services/esp_compile_scm/CMakeLists.txt

@@ -152,6 +152,6 @@ set (    SRCS
 
 # OBJS = 
 HPCC_ADD_EXECUTABLE ( esp_compile_scm ${SRCS} )
-install ( TARGETS esp_compile_scm DESTINATION ${OSSDIR}/bin )
+install ( TARGETS esp_compile_scm RUNTIME DESTINATION ${EXEC_DIR} )
 
 

esp/services/ws_access/CMakeLists.txt

@@ -55,7 +55,7 @@ include_directories ( ${OPENLDAP_INCLUDE_DIR} )
 ADD_DEFINITIONS( -D_USRDLL )
 
 HPCC_ADD_LIBRARY( ws_access SHARED ${SRCS} )
-install ( TARGETS ws_access DESTINATION ${OSSDIR}/lib COMPONENT Runtime)
+install ( TARGETS ws_access RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} COMPONENT Runtime)
 add_dependencies (ws_access espscm)
 target_link_libraries ( ws_access 
          jlib

esp/services/ws_account/CMakeLists.txt

@@ -55,7 +55,7 @@ include_directories ( ${OPENLDAP_INCLUDE_DIR} )
 ADD_DEFINITIONS( -D_USRDLL )
 
 HPCC_ADD_LIBRARY( ws_account SHARED ${SRCS} )
-install ( TARGETS ws_account DESTINATION ${OSSDIR}/lib COMPONENT Runtime )
+install ( TARGETS ws_account RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} COMPONENT Runtime )
 add_dependencies (ws_account espscm)
 target_link_libraries ( ws_account 
          jlib

esp/services/ws_config/CMakeLists.txt

@@ -54,7 +54,7 @@ include_directories (
 ADD_DEFINITIONS( -D_USRDLL )
 
 HPCC_ADD_LIBRARY( ws_config SHARED ${SRCS} )
-install ( TARGETS ws_config DESTINATION ${OSSDIR}/lib COMPONENT Runtime )
+install ( TARGETS ws_config RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} COMPONENT Runtime )
 add_dependencies (ws_config espscm)
 target_link_libraries ( ws_config 
          jlib

esp/services/ws_dfu/CMakeLists.txt

@@ -70,7 +70,7 @@ ADD_DEFINITIONS( -D_USRDLL -DWS_DFU_EXPORTS )
 
 HPCC_ADD_LIBRARY( ws_dfu SHARED ${SRCS} )
 add_dependencies ( ws_dfu espscm )
-install ( TARGETS ws_dfu DESTINATION ${OSSDIR}/lib )
+install ( TARGETS ws_dfu RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
 target_link_libraries ( ws_dfu
          jlib
          mp 

esp/services/ws_ecl/CMakeLists.txt

@@ -61,7 +61,7 @@ ADD_DEFINITIONS( -D_USRDLL )
 
 HPCC_ADD_LIBRARY( ws_ecl SHARED ${SRCS} )
 add_dependencies( ws_ecl espscm )
-install ( TARGETS ws_ecl DESTINATION ${OSSDIR}/lib )
+install ( TARGETS ws_ecl RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
 target_link_libraries ( ws_ecl  
          jlib
          xmllib 

esp/services/ws_fileio/CMakeLists.txt

@@ -63,7 +63,7 @@ include_directories (
 ADD_DEFINITIONS( -D_USRDLL )
 
 HPCC_ADD_LIBRARY( ws_fileio SHARED ${SRCS} )
-install ( TARGETS ws_fileio DESTINATION ${OSSDIR}/lib )
+install ( TARGETS ws_fileio RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
 add_dependencies (ws_fileio espscm)
 target_link_libraries ( ws_fileio 
          jlib

esp/services/ws_fs/CMakeLists.txt

@@ -65,7 +65,7 @@ ADD_DEFINITIONS( -D_USRDLL )
 
 HPCC_ADD_LIBRARY( ws_fs SHARED ${SRCS} )
 add_dependencies ( ws_fs espscm )
-install ( TARGETS ws_fs DESTINATION ${OSSDIR}/lib )
+install ( TARGETS ws_fs RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
 target_link_libraries ( ws_fs
          jlib
          esphttp 

esp/services/ws_machine/CMakeLists.txt

@@ -59,7 +59,7 @@ ADD_DEFINITIONS( -D_USRDLL )
 
 HPCC_ADD_LIBRARY( ws_machine SHARED ${SRCS} )
 add_dependencies( ws_machine espscm )
-install ( TARGETS ws_machine DESTINATION ${OSSDIR}/lib )
+install ( TARGETS ws_machine RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
 target_link_libraries ( ws_machine
          jlib
          roxiecommlib
@@ -83,6 +83,6 @@ FOREACH ( iFILES
     ${CMAKE_CURRENT_SOURCE_DIR}/rexec.xslt
     ${CMAKE_CURRENT_SOURCE_DIR}/preflightControls.xslt
 )
-    Install ( FILES ${iFILES} DESTINATION ${OSSDIR}/componentfiles/smc_xslt/ws_machine COMPONENT Runtime )
+    Install ( FILES ${iFILES} DESTINATION componentfiles/smc_xslt/ws_machine COMPONENT Runtime )
 ENDFOREACH ( iFILES )
 

esp/services/ws_packageprocess/CMakeLists.txt

@@ -45,7 +45,7 @@ include_directories (
 ADD_DEFINITIONS( -D_USRDLL )
 
 HPCC_ADD_LIBRARY( ws_packageprocess SHARED ${SRCS} )
-install ( TARGETS ws_packageprocess DESTINATION ${DIR_NAME}/lib )
+install ( TARGETS ws_packageprocess RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
 add_dependencies (ws_packageprocess espscm)
 target_link_libraries ( ws_packageprocess
          jlib

esp/services/ws_roxiequery/CMakeLists.txt

@@ -71,7 +71,7 @@ ADD_DEFINITIONS( -D_USRDLL )
 
 HPCC_ADD_LIBRARY( ws_roxiequery SHARED ${SRCS} )
 add_dependencies ( ws_roxiequery espscm )
-install ( TARGETS ws_roxiequery DESTINATION ${OSSDIR}/lib )
+install ( TARGETS ws_roxiequery RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
 target_link_libraries ( ws_roxiequery 
          jlib
          fileview2

esp/services/ws_smc/CMakeLists.txt

@@ -64,7 +64,7 @@ ADD_DEFINITIONS( -D_USRDLL -DWS_SMC_EXPORTS )
 
 HPCC_ADD_LIBRARY( ws_smc SHARED ${SRCS}  )
 add_dependencies ( ws_smc espscm )
-install ( TARGETS ws_smc DESTINATION ${OSSDIR}/lib )
+install ( TARGETS ws_smc RUNTIME DESTINATION ${EXEC_DIR} LIBRARY DESTINATION ${LIB_DIR} )
 target_link_libraries ( ws_smc 
          jlib
          xmllib