diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b3e5b3..cf80322 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -298,8 +298,10 @@ else (USE_EXT_GD) add_subdirectory(src) endif (USE_EXT_GD) -add_subdirectory(tests) -add_subdirectory(examples) +if(BUILD_TEST) + add_subdirectory(tests) + add_subdirectory(examples) +endif() add_subdirectory(docs) add_custom_target(distclean ${GD_SOURCE_DIR}/cmake/distclean.sh) @@ -317,7 +319,7 @@ else(WIN32) set(CPACK_GENERATOR TGZ) endif(WIN32) - +if(0) INSTALL(FILES docs/INSTALL DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) INSTALL(FILES docs/README.JPN DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) INSTALL(FILES docs/README.CMAKE DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) @@ -339,7 +341,7 @@ INSTALL(FILES examples/test_crop_threshold.png DESTINATION share/doc/gd-${GDLIB_ INSTALL(FILES examples/tgaread.c DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) INSTALL(FILES examples/tiffread.c DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) INSTALL(FILES examples/windows.c DESTINATION share/doc/gd-${GDLIB_MAJOR}.${GDLIB_MINOR}) - +endif() set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3839bc7..f7dabf7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -76,7 +76,7 @@ if (BUILD_STATIC_LIBS) if (UNIX) set_target_properties(${GD_LIB_STATIC} PROPERTIES OUTPUT_NAME ${GD_LIB}) endif() -endif() + if (NOT "${GD_PROGRAMS_LIB_SRC_FILES}" STREQUAL "") add_library(gd_programs_lib STATIC ${GD_PROGRAMS_LIB_SRC_FILES}) @@ -90,6 +90,7 @@ if (WIN32 AND NOT MINGW AND NOT MSYS) endif() ENDIF(WIN32 AND NOT MINGW AND NOT MSYS) +endif() if (MINGW OR MSYS) ADD_DEFINITIONS("-mms-bitfields") @@ -127,7 +128,7 @@ SET(LIBS_PRIVATES ${LIQ_LIBRARIES} ${WEBP_LIBRARIES} ) - +if(BUILD_PROGRAMS) set(GD_PROGRAMS gdcmpgif) if (PNG_FOUND) @@ -168,6 +169,9 @@ foreach(program ${GD_PROGRAMS}) endif() endforeach(program) +install(PROGRAMS bdftogd DESTINATION bin) +endif() + set(GD_INSTALL_TARGETS ${GD_PROGRAMS}) if (BUILD_SHARED_LIBS) set(GD_INSTALL_TARGETS ${GD_INSTALL_TARGETS} ${GD_LIB}) @@ -180,7 +184,7 @@ install(TARGETS ${GD_INSTALL_TARGETS} RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -install(PROGRAMS bdftogd DESTINATION bin) + install(FILES gd.h gd_color_map.h