--- ray/CMakeLists.txt	2018/06/20 03:04:44	1.20
+++ ray/CMakeLists.txt	2020/07/17 16:05:05	1.23
@@ -38,6 +38,7 @@ if(NOT WIN32)
 endif()
 
 if(WIN32)
+  set(CPACK_NSIS_INSTALL_ROOT "C:")
   set(CPACK_NSIS_MODIFY_PATH 1)
   set(qt_plugin_term "LIBRARY")
 
@@ -59,12 +60,11 @@ else()
   set(CPACK_PACKAGING_INSTALL_PREFIX "/")
 endif()
 
-set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK}-${CMAKE_SYSTEM_NAME}")
+set(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_TWEAK}-${CMAKE_SYSTEM_NAME}")
 
 if(APPLE)
   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c11 -std=c++11 -stdlib=libc++")
   add_definitions(-DBSD -DNOSTEREO -Dfreebsd)
-  #include_directories(/usr/X11R6/include)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.7")
 endif()
 
@@ -103,7 +103,6 @@ endif()
 
 set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
 set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
-set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
 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")
@@ -152,6 +151,10 @@ add_subdirectory(resources)
 install(DIRECTORY "${CMAKE_BINARY_DIR}/lib/"
   DESTINATION "lib"
 )
+
+# copy make tests to build
+file(COPY test DESTINATION ${CMAKE_BINARY_DIR})
+
 
 include(InstallRequiredSystemLibraries)
 add_subdirectory(InstallRules)