sample.json fixes similar to embree...: remove env, fix pathing

MichaelRoyceCarroll · web-flow · commit bc1b6a07d411 · 2021-10-29T10:08:38.000-07:00
diff --git a/RenderingToolkit/GettingStarted/01_ospray_gsg/sample.json b/RenderingToolkit/GettingStarted/01_ospray_gsg/sample.json
@@ -11,42 +11,39 @@
   "ciTests": {
   	"linux": [
                 {
-  		"env": ["source /opt/intel/oneapi/setvars.sh --force"],
   		"id": "Intel_OSPRay_ospTutorial_lin",
   		"steps": [
                     "mkdir build",
                     "cd build",
-                    "cmake -DCMAKE_PREFIX_PATH=\"/opt/intel/oneAPI\" ..",
+                    "cmake ..",
                     "cmake --build . ",
                     "./ospTutorialCpp"
   		 ]
   	         }
         ],
         "windows":[
 		{
-		"env": ["call \"C:\\Program Files (x86)\\Intel\\oneAPI\\setvars.bat\""],
 		"id": "Intel_OSPRay_ospTutorial_win",
 		"steps":[
                     "mkdir build",
                     "cd build",
-		    "cmake -G\"Visual Studio 16 2019\" -A x64 -DCMAKE_PREFIX_PATH=\"C:/Program Files (x86)/Intel/oneAPI\" ..",
+		    "cmake ..",
 		    "cmake --build . --config Release",
 		    "cd Release",
 		    ".\\ospTutorialCpp.exe"
 		]
 
 		}
 	],
-        "macos": [
+        "darwin": [
                 {
-                "env": ["source /opt/intel/oneapi/setvars.sh --force"],
                 "id": "Intel_OSPRay_ospTutorial_mac",
                 "steps": [
                     "mkdir build",
                     "cd build",
-                    "cmake -DCMAKE_PREFIX_PATH=\"/opt/intel/oneAPI\" ..",
+                    "cmake ..",
                     "cmake --build . ",
-                    "./ospTutorialCpp"
+                    "export DYLD_LIBRARY_PATH=${LIBRARY_PATH} && ./ospTutorialCpp"
                  ]
                  }
         ]

Original file line number	Diff line number	Diff line change
`@@ -11,42 +11,39 @@`
`11`	`11`	`"ciTests": {`
`12`	`12`	`"linux": [`
`13`	`13`	`{`
`14`		`- "env": ["source /opt/intel/oneapi/setvars.sh --force"],`
`15`	`14`	`"id": "Intel_OSPRay_ospTutorial_lin",`
`16`	`15`	`"steps": [`
`17`	`16`	`"mkdir build",`
`18`	`17`	`"cd build",`
`19`		`- "cmake -DCMAKE_PREFIX_PATH=\"/opt/intel/oneAPI\" ..",`
	`18`	`+ "cmake ..",`
`20`	`19`	`"cmake --build . ",`
`21`	`20`	`"./ospTutorialCpp"`
`22`	`21`	`]`
`23`	`22`	`}`
`24`	`23`	`],`
`25`	`24`	`"windows":[`
`26`	`25`	`{`
`27`		`- "env": ["call \"C:\\Program Files (x86)\\Intel\\oneAPI\\setvars.bat\""],`
`28`	`26`	`"id": "Intel_OSPRay_ospTutorial_win",`
`29`	`27`	`"steps":[`
`30`	`28`	`"mkdir build",`
`31`	`29`	`"cd build",`
`32`		`- "cmake -G\"Visual Studio 16 2019\" -A x64 -DCMAKE_PREFIX_PATH=\"C:/Program Files (x86)/Intel/oneAPI\" ..",`
	`30`	`+ "cmake ..",`
`33`	`31`	`"cmake --build . --config Release",`
`34`	`32`	`"cd Release",`
`35`	`33`	`".\\ospTutorialCpp.exe"`
`36`	`34`	`]`
`37`	`35`
`38`	`36`	`}`
`39`	`37`	`],`
`40`		`- "macos": [`
	`38`	`+ "darwin": [`
`41`	`39`	`{`
`42`		`- "env": ["source /opt/intel/oneapi/setvars.sh --force"],`
`43`	`40`	`"id": "Intel_OSPRay_ospTutorial_mac",`
`44`	`41`	`"steps": [`
`45`	`42`	`"mkdir build",`
`46`	`43`	`"cd build",`
`47`		`- "cmake -DCMAKE_PREFIX_PATH=\"/opt/intel/oneAPI\" ..",`
	`44`	`+ "cmake ..",`
`48`	`45`	`"cmake --build . ",`
`49`		`- "./ospTutorialCpp"`
	`46`	`+ "export DYLD_LIBRARY_PATH=${LIBRARY_PATH} && ./ospTutorialCpp"`
`50`	`47`	`]`
`51`	`48`	`}`
`52`	`49`	`]`