Minor fixes for 5.1 release

CMakeLists.txt

@@ -16,6 +16,7 @@ include(CTest)
 
 option(BUILD_SHARED_LIBS "Build radiance using shared libraries?" OFF)
 option(BUILD_HEADLESS "Build radiance without any GUI components?" OFF)
+option(BUILD_PABOPTO_UTILS "Build PABOpto Utilities?" OFF)
 
 option(CPACK_NREL_SUPPORT "Include OpenStudio ToolFinder Help?" OFF)
 
@@ -76,8 +77,8 @@ IF( BUILD_PACKAGE )
 ENDIF( BUILD_PACKAGE )
 
 set(CPACK_PACKAGE_VERSION_MAJOR 5)
-set(CPACK_PACKAGE_VERSION_MINOR 0)
-set(CPACK_PACKAGE_VERSION_PATCH a.8)
+set(CPACK_PACKAGE_VERSION_MINOR 1)
+set(CPACK_PACKAGE_VERSION_PATCH 0)
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "Radiance")
 SET(CPACK_RESOURCE_FILE_WELCOME "${radiance_SOURCE_DIR}/Welcome.txt")
 SET(CPACK_RESOURCE_FILE_README "${radiance_SOURCE_DIR}/README.txt")

README.txt

@@ -1,7 +1,7 @@
-		RCSid "$Id: README.txt,v 1.3 2015/05/12 17:33:53 greg Exp $"
+		RCSid "$Id: README.txt,v 1.4 2017/08/19 14:16:15 greg Exp $"
 
 Hello and welcome to the Radiance synthetic imaging system.  This is
-the twenty-first release, Version 5.0, and it includes all source files
+the twenty-second release, Version 5.1, and it includes all source files
 for local compilation with a standard C compiler.  To find out what's
 new in this release, check the text file "doc/notes/ReleaseNotes".
 

src/cv/CMakeLists.txt

@@ -30,21 +30,21 @@ target_link_libraries(mgf2inv mgf rtrad)
 add_executable(3ds2mgf 3ds2mgf.c rayopt3ds.c vect3ds.c)
 target_link_libraries(3ds2mgf rtrad) 
 
-if (NOT WIN32)
+if (BUILD_PABOPTO_UTILS)
 
   add_executable(pabopto2bsdf pabopto2bsdf.c bsdfrep.c bsdfrbf.c bsdfmesh.c bsdftrans.cpp)
   target_link_libraries(pabopto2bsdf rtrad) 
 
-  add_executable(pabopto2xyz pabopto2xyz.c)
-  target_link_libraries(pabopto2xyz rtrad)
+  #add_executable(pabopto2xyz pabopto2xyz.c)
+  #target_link_libraries(pabopto2xyz rtrad)
 
   add_executable(pabopto2rad	pabopto2bsdf.c bsdfrep.c bsdfrbf.c bsdfmesh.c bsdftrans.cpp)
   target_link_libraries(pabopto2rad rtrad)
   set_target_properties(pabopto2rad PROPERTIES COMPILE_DEFINITIONS TEST_MAIN)
 
 endif()
 
-add_executable(bsdf2rad	bsdf2rad.c bsdfrep.c bsdfinterp.c)
+add_executable(bsdf2rad bsdf2rad.c bsdfrep.c bsdfinterp.c)
 target_link_libraries(bsdf2rad rtrad)
 
 add_executable(bsdfquery bsdfquery.c bsdfrep.c bsdfinterp.c)
@@ -76,5 +76,8 @@ INSTALL(FILES source.cal tilt.cal lamp.tab window.cal bsdf2rad.cal
 
 if (NOT WIN32)
   INSTALL(PROGRAMS optics2rad.csh DESTINATION bin RENAME optics2rad)
+  endif()
+
+if (BUILD_PABOPTO_UTILS)
   INSTALL(TARGETS pabopto2rad pabopto2bsdf DESTINATION bin)
 endif()