--- CMakeLists.txt.orig 2023-03-09 12:51:28 UTC +++ CMakeLists.txt @@ -164,7 +164,7 @@ target_link_libraries( cxxplot target_compile_options( cxxplot PRIVATE $<$:> # TODO ADD /W4 /WX here by fixing cxxplot_WARNOFF / ON - $<$>:-Wall -Wextra -pedantic -Werror> + $<$>:-Wall -Wextra -pedantic> ) # Install, export targets, cmake config and version @@ -172,8 +172,8 @@ include( GNUInstallDirs ) install( TARGETS cxxplot EXPORT cxxplotTargets - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${CXXPLOT_DIR_WITH_VERSION} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${CXXPLOT_DIR_WITH_VERSION} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) @@ -203,7 +203,7 @@ install( FILES ${CXXPLOT_PUBLIC_HDR} DESTINATION - ${CMAKE_INSTALL_INCLUDEDIR}/${CXXPLOT_DIR_WITH_VERSION}/cxxplot + ${CMAKE_INSTALL_INCLUDEDIR}/cxxplot ) install(EXPORT cxxplotTargets @@ -212,7 +212,7 @@ install(EXPORT cxxplotTargets NAMESPACE cxxplot:: DESTINATION - ${CMAKE_INSTALL_LIBDIR}/cmake/${CXXPLOT_DIR_WITH_VERSION} + ${CMAKE_INSTALL_LIBDIR}/cmake/cxxplot ) install( @@ -220,13 +220,14 @@ install( ${CMAKE_BINARY_DIR}/cmake/cxxplotConfig.cmake ${CMAKE_BINARY_DIR}/cmake/cxxplotConfigVersion.cmake DESTINATION - ${CMAKE_INSTALL_LIBDIR}/cmake/${CXXPLOT_DIR_WITH_VERSION} + ${CMAKE_INSTALL_LIBDIR}/cmake/cxxplot ) # tests/examples -if ( CXXPLOT_NOT_SUBPROJECT ) - +if (BUILD_TESTING) add_subdirectory( tests ) -add_subdirectory( examples ) +endif() -endif( CXXPLOT_NOT_SUBPROJECT ) +if (BUILD_EXAMPLES) +add_subdirectory( examples ) +endif()