--- ray/CMakeLists.txt 2018/06/20 20:51:24 1.21 +++ ray/CMakeLists.txt 2023/01/11 23:18:57 1.25 @@ -34,10 +34,11 @@ option(BUILD_LIBTIFF "Build libtiff?" OFF) if(NOT WIN32) set(CPACK_INCLUDE_TOPLEVEL_DIRECTORY 1) install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/doc/man/" DESTINATION man) - set(qt_plugin_term "PLUGIN") + # set(qt_plugin_term "PLUGIN") endif() if(WIN32) + set(CPACK_NSIS_INSTALL_ROOT "C:") set(CPACK_NSIS_MODIFY_PATH 1) set(qt_plugin_term "LIBRARY") @@ -77,6 +78,7 @@ if(BUILD_LIBTIFF) URL_MD5 ${LIBTIFF_MD5} CMAKE_GENERATOR "NMake Makefiles" CMAKE_ARGS + "-UHAVE_UNISTD_H" "-DBUILD_SHARED_LIBS=OFF" "-DCMAKE_BUILD_TYPE=Release" "-Dzlib=OFF" @@ -116,10 +118,10 @@ endif() include(CPack) if(NOT BUILD_HEADLESS) - find_package(Qt5Widgets) - get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION) - get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH) - get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE) + # find_package(Qt5Widgets) + # get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION) + # get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH) + # get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE) find_package(X11) if(APPLE) include_directories(${X11_INCLUDE_DIR}) @@ -130,6 +132,8 @@ set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin) if(MSVC) add_definitions(/MP) + # Suppress warnings about double-to-float assignments and initializations + add_compile_options(/wd"4244" /wd"4305") endif() if(WIN32 AND "${CMAKE_C_COMPILER_ID}" MATCHES "^(Intel)$") set(_INTEL_WINDOWS 1) @@ -150,6 +154,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)