83 lines
2.5 KiB
Diff
83 lines
2.5 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 57cd95d..50d5b9a 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -280,8 +280,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_custom_target(distclean ${GD_SOURCE_DIR}/cmake/distclean.sh)
|
||
|
|
|
||
|
|
@@ -298,7 +300,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})
|
||
|
|
@@ -320,7 +322,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 509c422..97a2976 100644
|
||
|
|
--- a/src/CMakeLists.txt
|
||
|
|
+++ b/src/CMakeLists.txt
|
||
|
|
@@ -96,7 +96,6 @@ 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})
|
||
|
|
@@ -117,6 +116,7 @@ if (MINGW OR MSYS)
|
||
|
|
set_target_properties(${GD_LIB_STATIC} PROPERTIES OUTPUT_NAME ${GD_LIB})
|
||
|
|
endif()
|
||
|
|
endif (MINGW OR MSYS)
|
||
|
|
+endif()
|
||
|
|
|
||
|
|
INCLUDE_DIRECTORIES(BEFORE "${PROJECT_BINARY_DIR}" "${CMAKE_BINARY_DIR}" "${GD_SOURCE_DIR}/src")
|
||
|
|
|
||
|
|
@@ -148,6 +148,7 @@ SET(LIBS_PRIVATES
|
||
|
|
${WEBP_LIBRARIES}
|
||
|
|
)
|
||
|
|
|
||
|
|
+if(BUILD_PROGRAMS)
|
||
|
|
set(GD_PROGRAMS gdcmpgif)
|
||
|
|
|
||
|
|
if (PNG_FOUND)
|
||
|
|
@@ -177,6 +178,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})
|
||
|
|
@@ -189,7 +193,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
|
||
|
|
entities.h
|
||
|
|
gd.h
|