* disabled Reader_Waters_Test for 32-bit build

biospi · Nov 22, 2022 · aa73107 · aa73107
1 parent a9e980b
commit aa73107
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/pwiz/data/vendor_readers/Waters/Jamfile.jam b/pwiz/data/vendor_readers/Waters/Jamfile.jam
@@ -51,7 +51,8 @@ rule vendor-api-requirements ( properties * )
        [ project-exists $(API_PATH) ] &&
        [ masslynxraw-dll-location $(API_PATH) : $(properties) ] &&
 	   ! [ without-binary-msdata $(properties) ] &&
-       ! <vendor-api-support>off in $(properties)
+       ! <vendor-api-support>off in $(properties) && 
+       ! <address-model>32 in $(properties)
     {
         result += <source>Reader_Waters_Detail.cpp ;
     }
@@ -65,7 +66,8 @@ rule vendor-api-usage-requirements ( properties * )
        [ project-exists $(API_PATH) ] &&
        [ masslynxraw-dll-location $(API_PATH) : $(properties) ]  &&
 	   ! [ without-binary-msdata $(properties) ] &&
-       ! <vendor-api-support>off in $(properties)
+       ! <vendor-api-support>off in $(properties) && 
+       ! <address-model>32 in $(properties)
     {
         result += <library>$(API_PATH)//pwiz_vendor_api_waters ;
         result += <define>PWIZ_READER_WATERS ;
@@ -89,6 +91,10 @@ rule vendor-api-usage-requirements ( properties * )
         {
             echo "[$(READER_PATH)] Missing DLL: $(READER_NAME) can only identify files, not read them." ;
         }
+        else if <address-model>32 in $(properties)
+        {
+            echo "[$(READER_PATH)] 32-bit build: $(READER_NAME) can only identify files, not read them." ;
+        }
     }
     return $(result) ;
 }
@@ -145,6 +151,10 @@ rule test-requirements ( properties * )
     {
         warn-once "[$(READER_PATH)] Missing DLL: $(READER_NAME)_Test is only testing that it can identify files, not read them." ;
     }
+    else if <address-model>32 in $(properties)
+    {
+        warn-once "[$(READER_PATH)] 32-bit build: $(READER_NAME)_Test is only testing that it can identify files, not read them." ;
+    }
 
     return $(result) ;
 }

diff --git a/pwiz_aux/msrc/utility/vendor_api/Waters/Jamfile.jam b/pwiz_aux/msrc/utility/vendor_api/Waters/Jamfile.jam
@@ -35,7 +35,8 @@ import path ;
 rule vendor-api-requirements ( properties * )
 {
     local result = [ masslynxraw-dll-location $(API_PATH) : $(properties) ] ;
-    if $(result)
+    if $(result) && 
+       ! <address-model>32 in $(properties)
     {
         result = <search>$(result) ;
     }