ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/resources/cmake_tests/setup_paths.cmake.in
(Generate patch)

Comparing ray/resources/cmake_tests/setup_paths.cmake.in (file contents):
Revision 1.1 by greg, Mon Dec 4 21:58:10 2017 UTC vs.
Revision 1.2 by greg, Mon Jan 8 16:51:31 2018 UTC

# Line 5 | Line 5 | else()
5    set(rtcontrib_threads "-n;2;")
6   endif()
7  
8
9 file(TO_NATIVE_PATH "@radiance_SOURCE_DIR@/src/gen" gen_dir)
10 file(TO_NATIVE_PATH "@radiance_SOURCE_DIR@/src/cal/cal" cal_dir)
11 file(TO_NATIVE_PATH "@radiance_SOURCE_DIR@/src/rt" rt_dir)
12 file(TO_NATIVE_PATH "@radiance_SOURCE_DIR@/src/util" util_dir)
13 file(TO_NATIVE_PATH "@radiance_SOURCE_DIR@/src/px" px_dir)
14 file(TO_NATIVE_PATH
15  "@radiance_BINARY_DIR@/Downloads/Source/radiance_support/lib" lib_dir)
8   file(TO_NATIVE_PATH "@PERL_EXECUTABLE@" perl)
9 < set(office_dir @office_dir@)
18 < #office_dir is defined in CMakeLists.txt
9 > set(resources_dir "@CMAKE_SOURCE_DIR@/resources")
10  
20 if(NOT EXISTS ${lib_dir}/pine.pic)
21  configure_file(${lib_dir}/pine.hdr ${lib_dir}/pine.pic COPYONLY)
22 endif()
23
24
11   if(WIN32)
12 <  file(TO_NATIVE_PATH "@radiance_BINARY_DIR@/bin/Release" rpath)
12 >  set(CMAKE_PERL_SUFFIX ".pl")
13 >  file(TO_NATIVE_PATH "@CMAKE_BINARY_DIR@/bin/Release" rpath)
14   else()
15 <  file(TO_NATIVE_PATH "@radiance_BINARY_DIR@/bin" rpath)
15 >  file(TO_NATIVE_PATH "@CMAKE_BINARY_DIR@/bin" rpath)
16   endif()
17 < set(ENV{RAYPATH}
18 < "${gen_dir}${sep}${cal_dir}${sep}${rt_dir}${sep}${lib_dir}${sep}@office_dir@")
32 < #set(ENV{PATH} "$ENV{PATH}${sep}${rpath}")
33 < #look in dashboard tree ONLY
17 > file(TO_NATIVE_PATH "@CMAKE_BINARY_DIR@/lib" rlibpath)
18 >
19   set(ENV{PATH} "${rpath}")
20 < set(test_output_dir
21 <  @radiance_BINARY_DIR@/Downloads/Source/radiance_support/obj/office/test)
20 > set(ENV{RAYPATH} "${rlibpath}")
21 > set(test_output_dir "@CMAKE_BINARY_DIR@/testfiles")
22   set(CMAKE_EXECUTABLE_SUFFIX @CMAKE_EXECUTABLE_SUFFIX@)
23 +
24 + message(STATUS "path: $ENV{PATH}")
25   message(STATUS "raypath: $ENV{RAYPATH}")

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines