Skip to content

Commit 0fa5ff1

Browse files
pschwartzpschwartz
committed
wip hpcc-systemsgh-2448 moved to cleaner method of directory inclusion.
Changed HPCC_ADD_SUBDIRECTORY to take a flag name as a second arg. This flag name is used to determine what directories to include at build time. Signed-off-by: Philip Schwartz <philip.schwartz@lexisnexis.com>
1 parent beab225 commit 0fa5ff1

14 files changed

+137
-135
lines changed

‎CMakeLists.txt

+16-16
Original file line numberDiff line numberDiff line change
@@ -107,24 +107,24 @@ include(${HPCC_SOURCE_DIR}/cmake_modules/commonSetup.cmake)
107107

108108
if ( NOT MAKE_DOCS_ONLY )
109109
if ( CMAKE_SYSTEM MATCHES Linux )
110-
HPCC_ADD_SUBDIRECTORY (initfiles)
110+
HPCC_ADD_SUBDIRECTORY (initfiles "ALL")
111111
endif ()
112-
HPCC_ADD_SUBDIRECTORY (tools)
113-
HPCC_ADD_SUBDIRECTORY (common)
114-
HPCC_ADD_SUBDIRECTORY (dali)
115-
HPCC_ADD_SUBDIRECTORY (deploy ${CLIENTTOOLS_ONLY})
116-
HPCC_ADD_SUBDIRECTORY (deployment)
117-
HPCC_ADD_SUBDIRECTORY (ecl)
118-
HPCC_ADD_SUBDIRECTORY (ecllibrary ${CLIENTTOOLS_ONLY})
119-
HPCC_ADD_SUBDIRECTORY (esp)
120-
HPCC_ADD_SUBDIRECTORY (plugins ${CLIENTTOOLS_ONLY})
121-
HPCC_ADD_SUBDIRECTORY (roxie ${CLIENTTOOLS_ONLY})
122-
HPCC_ADD_SUBDIRECTORY (rtl)
123-
HPCC_ADD_SUBDIRECTORY (services ${CLIENTTOOLS_ONLY})
124-
HPCC_ADD_SUBDIRECTORY (system)
125-
HPCC_ADD_SUBDIRECTORY (thorlcr ${CLIENTTOOLS_ONLY})
112+
HPCC_ADD_SUBDIRECTORY (tools "ALL")
113+
HPCC_ADD_SUBDIRECTORY (common "ALL")
114+
HPCC_ADD_SUBDIRECTORY (dali "ALL")
115+
HPCC_ADD_SUBDIRECTORY (deploy "PLATFORM")
116+
HPCC_ADD_SUBDIRECTORY (deployment "ALL")
117+
HPCC_ADD_SUBDIRECTORY (ecl "ALL")
118+
HPCC_ADD_SUBDIRECTORY (ecllibrary "PLATFORM")
119+
HPCC_ADD_SUBDIRECTORY (esp "ALL")
120+
HPCC_ADD_SUBDIRECTORY (plugins "PLATFORM")
121+
HPCC_ADD_SUBDIRECTORY (roxie "PLATFORM")
122+
HPCC_ADD_SUBDIRECTORY (rtl "ALL")
123+
HPCC_ADD_SUBDIRECTORY (services "PLATFORM")
124+
HPCC_ADD_SUBDIRECTORY (system "ALL")
125+
HPCC_ADD_SUBDIRECTORY (thorlcr "PLATFORM")
126126
endif()
127-
HPCC_ADD_SUBDIRECTORY (docs ${CLIENTTOOLS_ONLY})
127+
HPCC_ADD_SUBDIRECTORY (docs "PLATFORM")
128128

129129
###
130130
## CPack install and packaging setup.

‎cmake_modules/commonSetup.cmake

+11-9
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
4040

4141
cmake_policy ( SET CMP0011 NEW )
4242

43+
set(ALL ON) #Enable the building/inclusion of any component/dir marked as ALL
44+
option(CLIENTTOOLS "Enable the building/inclusion of a Client Tools component." ON)
45+
option(PLATFORM "Enable the building/inclusion of a Platform component." ON)
46+
option(DEVEL "Enable the building/inclusion of a Development component." OFF)
4347
option(CLIENTTOOLS_ONLY "Enable the building of Client Tools only." OFF)
4448

4549
option(USE_BINUTILS "Enable use of binutils to embed workunit info into shared objects" ON)
@@ -83,6 +87,11 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
8387
if ( MAKE_DOCS_ONLY AND NOT CLIENTTOOLS_ONLY )
8488
set( MAKE_DOCS ON )
8589
endif()
90+
91+
if ( CLIENTTOOLS_ONLY )
92+
set(PLATFORM OFF)
93+
set(DEVEL OFF)
94+
endif()
8695

8796
option(PORTALURL "Set url to hpccsystems portal download page")
8897

@@ -173,15 +182,8 @@ IF ("${COMMONSETUP_DONE}" STREQUAL "")
173182
#
174183
# This call will disable the roxie dir if -DCLIENTTOOLS_ONLY=ON is set at config time.
175184
#
176-
macro(HPCC_ADD_SUBDIRECTORY subdir)
177-
set(adddir 0)
178-
foreach( f ${ARGN} )
179-
if( f )
180-
set(adddir 1)
181-
endif()
182-
endforeach()
183-
184-
if ( NOT adddir )
185+
macro(HPCC_ADD_SUBDIRECTORY subdir flag)
186+
if ( ${flag} )
185187
add_subdirectory(${subdir})
186188
endif()
187189
endmacro(HPCC_ADD_SUBDIRECTORY)

‎common/CMakeLists.txt

+13-13
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
# You should have received a copy of the GNU Affero General Public License
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
################################################################################
19-
HPCC_ADD_SUBDIRECTORY (commonext)
20-
HPCC_ADD_SUBDIRECTORY (deftype)
21-
HPCC_ADD_SUBDIRECTORY (dllserver)
22-
HPCC_ADD_SUBDIRECTORY (environment)
23-
HPCC_ADD_SUBDIRECTORY (fileview2)
24-
HPCC_ADD_SUBDIRECTORY (monitoring ${CLIENTTOOLS_ONLY})
25-
HPCC_ADD_SUBDIRECTORY (remote)
26-
HPCC_ADD_SUBDIRECTORY (roxiecommlib)
27-
HPCC_ADD_SUBDIRECTORY (roxiehelper ${CLIENTTOOLS_ONLY})
28-
HPCC_ADD_SUBDIRECTORY (roxiemanager ${CLIENTTOOLS_ONLY})
29-
HPCC_ADD_SUBDIRECTORY (thorhelper)
30-
HPCC_ADD_SUBDIRECTORY (workunit)
31-
HPCC_ADD_SUBDIRECTORY (wuwebview ${CLIENTTOOLS_ONLY})
19+
HPCC_ADD_SUBDIRECTORY (commonext "ALL")
20+
HPCC_ADD_SUBDIRECTORY (deftype "ALL")
21+
HPCC_ADD_SUBDIRECTORY (dllserver "ALL")
22+
HPCC_ADD_SUBDIRECTORY (environment "ALL")
23+
HPCC_ADD_SUBDIRECTORY (fileview2 "ALL")
24+
HPCC_ADD_SUBDIRECTORY (monitoring "PLATFORM")
25+
HPCC_ADD_SUBDIRECTORY (remote "ALL")
26+
HPCC_ADD_SUBDIRECTORY (roxiecommlib "ALL")
27+
HPCC_ADD_SUBDIRECTORY (roxiehelper "PLATFORM")
28+
HPCC_ADD_SUBDIRECTORY (roxiemanager "PLATFORM")
29+
HPCC_ADD_SUBDIRECTORY (thorhelper "ALL")
30+
HPCC_ADD_SUBDIRECTORY (workunit "ALL")
31+
HPCC_ADD_SUBDIRECTORY (wuwebview "PLATFORM")

‎common/remote/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
project( remote )
2727

28-
HPCC_ADD_SUBDIRECTORY(hooks ${CLIENTTOOLS_ONLY})
28+
HPCC_ADD_SUBDIRECTORY(hooks "PLATFORM")
2929

3030
set ( SRCS
3131
rmtfile.cpp

‎dali/CMakeLists.txt

+17-17
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,22 @@
1616
# You should have received a copy of the GNU Affero General Public License
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
################################################################################
19-
HPCC_ADD_SUBDIRECTORY (base)
20-
HPCC_ADD_SUBDIRECTORY (dafilesrv)
21-
HPCC_ADD_SUBDIRECTORY (dalidiag ${CLIENTTOOLS_ONLY})
22-
HPCC_ADD_SUBDIRECTORY (dalistop ${CLIENTTOOLS_ONLY})
23-
HPCC_ADD_SUBDIRECTORY (datest ${CLIENTTOOLS_ONLY})
19+
HPCC_ADD_SUBDIRECTORY (base "ALL")
20+
HPCC_ADD_SUBDIRECTORY (dafilesrv "ALL")
21+
HPCC_ADD_SUBDIRECTORY (dalidiag "PLATFORM")
22+
HPCC_ADD_SUBDIRECTORY (dalistop "PLATFORM")
23+
HPCC_ADD_SUBDIRECTORY (datest "PLATFORM")
2424
if (USE_CPPUNIT)
25-
HPCC_ADD_SUBDIRECTORY (daunittest ${CLIENTTOOLS_ONLY})
25+
HPCC_ADD_SUBDIRECTORY (daunittest "PLATFORM")
2626
endif()
27-
HPCC_ADD_SUBDIRECTORY (dfu)
28-
HPCC_ADD_SUBDIRECTORY (dfuplus)
29-
HPCC_ADD_SUBDIRECTORY (dfuxref ${CLIENTTOOLS_ONLY})
30-
HPCC_ADD_SUBDIRECTORY (dfuXRefLib)
31-
HPCC_ADD_SUBDIRECTORY (ft)
32-
HPCC_ADD_SUBDIRECTORY (regress ${CLIENTTOOLS_ONLY})
33-
HPCC_ADD_SUBDIRECTORY (daliadmin ${CLIENTTOOLS_ONLY})
34-
HPCC_ADD_SUBDIRECTORY (server ${CLIENTTOOLS_ONLY})
35-
HPCC_ADD_SUBDIRECTORY (treeview ${CLIENTTOOLS_ONLY})
36-
HPCC_ADD_SUBDIRECTORY (updtdalienv ${CLIENTTOOLS_ONLY})
37-
HPCC_ADD_SUBDIRECTORY (sasha ${CLIENTTOOLS_ONLY})
27+
HPCC_ADD_SUBDIRECTORY (dfu "ALL")
28+
HPCC_ADD_SUBDIRECTORY (dfuplus "CLIENTTOOLS")
29+
HPCC_ADD_SUBDIRECTORY (dfuxref "PLATFORM")
30+
HPCC_ADD_SUBDIRECTORY (dfuXRefLib "ALL")
31+
HPCC_ADD_SUBDIRECTORY (ft "ALL")
32+
HPCC_ADD_SUBDIRECTORY (regress "PLATFORM")
33+
HPCC_ADD_SUBDIRECTORY (daliadmin "PLATFORM")
34+
HPCC_ADD_SUBDIRECTORY (server "PLATFORM")
35+
HPCC_ADD_SUBDIRECTORY (treeview "PLATFORM")
36+
HPCC_ADD_SUBDIRECTORY (updtdalienv "PLATFORM")
37+
HPCC_ADD_SUBDIRECTORY (sasha "PLATFORM")

‎deployment/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# You should have received a copy of the GNU Affero General Public License
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
################################################################################
19-
HPCC_ADD_SUBDIRECTORY (configgen)
20-
HPCC_ADD_SUBDIRECTORY (deploy)
21-
HPCC_ADD_SUBDIRECTORY (deployutils ${CLIENTTOOLS_ONLY})
22-
HPCC_ADD_SUBDIRECTORY (envgen ${CLIENTTOOLS_ONLY})
19+
HPCC_ADD_SUBDIRECTORY (configgen "ALL")
20+
HPCC_ADD_SUBDIRECTORY (deploy "ALL")
21+
HPCC_ADD_SUBDIRECTORY (deployutils "PLATFORM")
22+
HPCC_ADD_SUBDIRECTORY (envgen "PLATFORM")

‎ecl/CMakeLists.txt

+14-14
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@
1616
# You should have received a copy of the GNU Affero General Public License
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
################################################################################
19-
HPCC_ADD_SUBDIRECTORY (agentexec ${CLIENTTOOLS_ONLY})
20-
HPCC_ADD_SUBDIRECTORY (eclagent ${CLIENTTOOLS_ONLY})
21-
HPCC_ADD_SUBDIRECTORY (eclcc)
22-
HPCC_ADD_SUBDIRECTORY (eclccserver ${CLIENTTOOLS_ONLY})
23-
HPCC_ADD_SUBDIRECTORY (eclcmd)
24-
HPCC_ADD_SUBDIRECTORY (eclscheduler ${CLIENTTOOLS_ONLY})
25-
HPCC_ADD_SUBDIRECTORY (eclplus)
26-
HPCC_ADD_SUBDIRECTORY (ecl-package)
27-
HPCC_ADD_SUBDIRECTORY (hql)
28-
HPCC_ADD_SUBDIRECTORY (hqlcpp)
29-
HPCC_ADD_SUBDIRECTORY (hthor ${CLIENTTOOLS_ONLY})
30-
HPCC_ADD_SUBDIRECTORY (scheduleadmin ${CLIENTTOOLS_ONLY})
31-
HPCC_ADD_SUBDIRECTORY (schedulectrl ${CLIENTTOOLS_ONLY})
32-
HPCC_ADD_SUBDIRECTORY (wutest ${CLIENTTOOLS_ONLY})
19+
HPCC_ADD_SUBDIRECTORY (agentexec "PLATFORM")
20+
HPCC_ADD_SUBDIRECTORY (eclagent "PLATFORM")
21+
HPCC_ADD_SUBDIRECTORY (eclcc "ALL")
22+
HPCC_ADD_SUBDIRECTORY (eclccserver "PLATFORM")
23+
HPCC_ADD_SUBDIRECTORY (eclcmd "CLIENTTOOLS")
24+
HPCC_ADD_SUBDIRECTORY (eclscheduler "PLATFORM")
25+
HPCC_ADD_SUBDIRECTORY (eclplus "CLIENTTOOLS")
26+
HPCC_ADD_SUBDIRECTORY (ecl-package "CLIENTTOOLS")
27+
HPCC_ADD_SUBDIRECTORY (hql "ALL")
28+
HPCC_ADD_SUBDIRECTORY (hqlcpp "ALL")
29+
HPCC_ADD_SUBDIRECTORY (hthor "PLATFORM")
30+
HPCC_ADD_SUBDIRECTORY (scheduleadmin "PLATFORM")
31+
HPCC_ADD_SUBDIRECTORY (schedulectrl "PLATFORM")
32+
HPCC_ADD_SUBDIRECTORY (wutest "PLATFORM")

‎esp/CMakeLists.txt

+12-12
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
# You should have received a copy of the GNU Affero General Public License
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
################################################################################
19-
HPCC_ADD_SUBDIRECTORY (bindings ${CLIENTTOOLS_ONLY})
20-
HPCC_ADD_SUBDIRECTORY (clients ${CLIENTTOOLS_ONLY})
21-
HPCC_ADD_SUBDIRECTORY (eclwatch ${CLIENTTOOLS_ONLY})
22-
HPCC_ADD_SUBDIRECTORY (files ${CLIENTTOOLS_ONLY})
23-
HPCC_ADD_SUBDIRECTORY (platform ${CLIENTTOOLS_ONLY})
24-
HPCC_ADD_SUBDIRECTORY (protocols)
25-
HPCC_ADD_SUBDIRECTORY (scm)
26-
HPCC_ADD_SUBDIRECTORY (services)
27-
HPCC_ADD_SUBDIRECTORY (smc)
28-
HPCC_ADD_SUBDIRECTORY (test ${CLIENTTOOLS_ONLY})
29-
HPCC_ADD_SUBDIRECTORY (tools ${CLIENTTOOLS_ONLY})
30-
HPCC_ADD_SUBDIRECTORY (xslt ${CLIENTTOOLS_ONLY})
19+
HPCC_ADD_SUBDIRECTORY (bindings "PLATFORM")
20+
HPCC_ADD_SUBDIRECTORY (clients "PLATFORM")
21+
HPCC_ADD_SUBDIRECTORY (eclwatch "PLATFORM")
22+
HPCC_ADD_SUBDIRECTORY (files "PLATFORM")
23+
HPCC_ADD_SUBDIRECTORY (platform "PLATFORM")
24+
HPCC_ADD_SUBDIRECTORY (protocols "ALL")
25+
HPCC_ADD_SUBDIRECTORY (scm "ALL")
26+
HPCC_ADD_SUBDIRECTORY (services "ALL")
27+
HPCC_ADD_SUBDIRECTORY (smc "ALL")
28+
HPCC_ADD_SUBDIRECTORY (test "PLATFORM")
29+
HPCC_ADD_SUBDIRECTORY (tools "PLATFORM")
30+
HPCC_ADD_SUBDIRECTORY (xslt "PLATFORM")

‎esp/services/CMakeLists.txt

+15-15
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,20 @@
1616
# You should have received a copy of the GNU Affero General Public License
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
################################################################################
19-
HPCC_ADD_SUBDIRECTORY (ecldirect ${CLIENTTOOLS_ONLY})
19+
HPCC_ADD_SUBDIRECTORY (ecldirect "PLATFORM")
2020
IF (USE_OPENLDAP)
21-
HPCC_ADD_SUBDIRECTORY (ws_access ${CLIENTTOOLS_ONLY})
21+
HPCC_ADD_SUBDIRECTORY (ws_access "PLATFORM")
2222
ENDIF(USE_OPENLDAP)
23-
HPCC_ADD_SUBDIRECTORY (ws_account ${CLIENTTOOLS_ONLY})
24-
HPCC_ADD_SUBDIRECTORY (ws_config ${CLIENTTOOLS_ONLY})
25-
HPCC_ADD_SUBDIRECTORY (ws_dfu )
26-
HPCC_ADD_SUBDIRECTORY (ws_ecl ${CLIENTTOOLS_ONLY})
27-
HPCC_ADD_SUBDIRECTORY (ws_fileio ${CLIENTTOOLS_ONLY})
28-
HPCC_ADD_SUBDIRECTORY (ws_fs)
29-
HPCC_ADD_SUBDIRECTORY (ws_machine ${CLIENTTOOLS_ONLY})
30-
HPCC_ADD_SUBDIRECTORY (ws_roxiequery ${CLIENTTOOLS_ONLY})
31-
HPCC_ADD_SUBDIRECTORY (ws_smc ${CLIENTTOOLS_ONLY})
32-
HPCC_ADD_SUBDIRECTORY (ws_topology ${CLIENTTOOLS_ONLY})
33-
HPCC_ADD_SUBDIRECTORY (ws_workunits ${CLIENTTOOLS_ONLY})
34-
HPCC_ADD_SUBDIRECTORY (WsDeploy ${CLIENTTOOLS_ONLY})
35-
HPCC_ADD_SUBDIRECTORY (ws_packageprocess ${CLIENTTOOLS_ONLY})
23+
HPCC_ADD_SUBDIRECTORY (ws_account "PLATFORM")
24+
HPCC_ADD_SUBDIRECTORY (ws_config "PLATFORM")
25+
HPCC_ADD_SUBDIRECTORY (ws_dfu "ALL")
26+
HPCC_ADD_SUBDIRECTORY (ws_ecl "PLATFORM")
27+
HPCC_ADD_SUBDIRECTORY (ws_fileio "PLATFORM")
28+
HPCC_ADD_SUBDIRECTORY (ws_fs "ALL")
29+
HPCC_ADD_SUBDIRECTORY (ws_machine "PLATFORM")
30+
HPCC_ADD_SUBDIRECTORY (ws_roxiequery "PLATFORM")
31+
HPCC_ADD_SUBDIRECTORY (ws_smc "PLATFORM")
32+
HPCC_ADD_SUBDIRECTORY (ws_topology "PLATFORM")
33+
HPCC_ADD_SUBDIRECTORY (ws_workunits "PLATFORM")
34+
HPCC_ADD_SUBDIRECTORY (WsDeploy "PLATFORM")
35+
HPCC_ADD_SUBDIRECTORY (ws_packageprocess "PLATFORM")

‎rtl/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
# You should have received a copy of the GNU Affero General Public License
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
################################################################################
19-
HPCC_ADD_SUBDIRECTORY (eclrtl)
20-
HPCC_ADD_SUBDIRECTORY (ecltpl ${CLIENTTOOLS_ONLY})
21-
HPCC_ADD_SUBDIRECTORY (include ${CLIENTTOOLS_ONLY})
22-
HPCC_ADD_SUBDIRECTORY (nbcd)
19+
HPCC_ADD_SUBDIRECTORY (eclrtl "ALL")
20+
HPCC_ADD_SUBDIRECTORY (ecltpl "PLATFORM")
21+
HPCC_ADD_SUBDIRECTORY (include "PLATFORM")
22+
HPCC_ADD_SUBDIRECTORY (nbcd "ALL")

‎system/CMakeLists.txt

+9-9
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
# You should have received a copy of the GNU Affero General Public License
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
################################################################################
19-
HPCC_ADD_SUBDIRECTORY (hrpc)
20-
HPCC_ADD_SUBDIRECTORY (include ${CLIENTTOOLS_ONLY})
21-
HPCC_ADD_SUBDIRECTORY (jhtree)
22-
HPCC_ADD_SUBDIRECTORY (jlib)
23-
HPCC_ADD_SUBDIRECTORY (lzma)
24-
HPCC_ADD_SUBDIRECTORY (mp)
25-
HPCC_ADD_SUBDIRECTORY (security)
26-
HPCC_ADD_SUBDIRECTORY (xmllib)
27-
HPCC_ADD_SUBDIRECTORY (xmllibtest ${CLIENTTOOLS_ONLY})
19+
HPCC_ADD_SUBDIRECTORY (hrpc "ALL")
20+
HPCC_ADD_SUBDIRECTORY (include "PLATFORM")
21+
HPCC_ADD_SUBDIRECTORY (jhtree "ALL")
22+
HPCC_ADD_SUBDIRECTORY (jlib "ALL")
23+
HPCC_ADD_SUBDIRECTORY (lzma "ALL")
24+
HPCC_ADD_SUBDIRECTORY (mp "ALL")
25+
HPCC_ADD_SUBDIRECTORY (security "ALL")
26+
HPCC_ADD_SUBDIRECTORY (xmllib "ALL")
27+
HPCC_ADD_SUBDIRECTORY (xmllibtest "PLATFORM")

‎system/mp/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ target_link_libraries ( mp
4747
jlib
4848
)
4949

50-
HPCC_ADD_SUBDIRECTORY(test ${CLIENTTOOLS_ONLY})
50+
HPCC_ADD_SUBDIRECTORY(test "PLATFORM")

‎system/security/CMakeLists.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
################################################################################
1919
IF (USE_OPENLDAP)
20-
HPCC_ADD_SUBDIRECTORY (LdapSecurity)
20+
HPCC_ADD_SUBDIRECTORY (LdapSecurity "ALL")
2121
ENDIF(USE_OPENLDAP)
22-
HPCC_ADD_SUBDIRECTORY (securesocket)
23-
HPCC_ADD_SUBDIRECTORY (test ${CLIENTTOOLS_ONLY})
22+
HPCC_ADD_SUBDIRECTORY (securesocket "ALL")
23+
HPCC_ADD_SUBDIRECTORY (test "PLATFORM")
2424
if (USE_ZLIB)
25-
HPCC_ADD_SUBDIRECTORY (zcrypt ${CLIENTTOOLS_ONLY})
25+
HPCC_ADD_SUBDIRECTORY (zcrypt "PLATFORM")
2626
endif()

‎tools/CMakeLists.txt

+16-16
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@
1616
# You should have received a copy of the GNU Affero General Public License
1717
# along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
################################################################################
19-
HPCC_ADD_SUBDIRECTORY (esdl)
20-
HPCC_ADD_SUBDIRECTORY (hidl)
21-
HPCC_ADD_SUBDIRECTORY (backupnode ${CLIENTTOOLS_ONLY})
22-
HPCC_ADD_SUBDIRECTORY (combine ${CLIENTTOOLS_ONLY})
23-
HPCC_ADD_SUBDIRECTORY (dumpkey ${CLIENTTOOLS_ONLY})
24-
HPCC_ADD_SUBDIRECTORY (keydiff ${CLIENTTOOLS_ONLY})
25-
HPCC_ADD_SUBDIRECTORY (pstart ${CLIENTTOOLS_ONLY})
26-
HPCC_ADD_SUBDIRECTORY (pskill ${CLIENTTOOLS_ONLY})
27-
HPCC_ADD_SUBDIRECTORY (testsocket ${CLIENTTOOLS_ONLY})
28-
HPCC_ADD_SUBDIRECTORY (swapnode ${CLIENTTOOLS_ONLY})
29-
HPCC_ADD_SUBDIRECTORY (vkey ${CLIENTTOOLS_ONLY})
30-
HPCC_ADD_SUBDIRECTORY (xmlsize ${CLIENTTOOLS_ONLY})
31-
HPCC_ADD_SUBDIRECTORY (wuget)
32-
HPCC_ADD_SUBDIRECTORY (copyexp ${CLIENTTOOLS_ONLY})
33-
HPCC_ADD_SUBDIRECTORY (genht ${CLIENTTOOLS_ONLY})
19+
HPCC_ADD_SUBDIRECTORY (esdl "ALL")
20+
HPCC_ADD_SUBDIRECTORY (hidl "ALL")
21+
HPCC_ADD_SUBDIRECTORY (backupnode "PLATFORM")
22+
HPCC_ADD_SUBDIRECTORY (combine "PLATFORM")
23+
HPCC_ADD_SUBDIRECTORY (dumpkey "PLATFORM")
24+
HPCC_ADD_SUBDIRECTORY (keydiff "PLATFORM")
25+
HPCC_ADD_SUBDIRECTORY (pstart "PLATFORM")
26+
HPCC_ADD_SUBDIRECTORY (pskill "PLATFORM")
27+
HPCC_ADD_SUBDIRECTORY (testsocket "PLATFORM")
28+
HPCC_ADD_SUBDIRECTORY (swapnode "PLATFORM")
29+
HPCC_ADD_SUBDIRECTORY (vkey "PLATFORM")
30+
HPCC_ADD_SUBDIRECTORY (xmlsize "PLATFORM")
31+
HPCC_ADD_SUBDIRECTORY (wuget "CLIENTTOOLS")
32+
HPCC_ADD_SUBDIRECTORY (copyexp "PLATFORM")
33+
HPCC_ADD_SUBDIRECTORY (genht "PLATFORM")
3434

3535
# start-stop-daemon is linux only.
3636
if ( CMAKE_SYSTEM MATCHES Linux )
3737
message ("-- Building start-stop-daemon")
38-
HPCC_ADD_SUBDIRECTORY (start-stop-daemon)
38+
HPCC_ADD_SUBDIRECTORY (start-stop-daemon "ALL")
3939
endif()

0 commit comments

Comments
 (0)