diff options
| author | Nathanael Jones <nathanael.jones@gmail.com> | 2014-10-17 12:56:54 -0400 |
|---|---|---|
| committer | Nathanael Jones <nathanael.jones@gmail.com> | 2015-01-07 01:55:53 -0500 |
| commit | 40c61299862c313802e1017747ba996f627568b1 (patch) | |
| tree | 6f7c3c3a699c282673ae6cd3f77ef9cb74fc7baf | |
| parent | 7c2b0713e78d0d6caa09d6aa58318441801794ea (diff) | |
| download | libgd-40c61299862c313802e1017747ba996f627568b1.tar.gz | |
Normalize static lib name to libgd.a on *nix and libgd_static.lib on windows.
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 23ec103..f6aa66b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -208,7 +208,7 @@ else (USE_EXT_GD) SET(GD_LIB gd) endif (WIN32) - SET(GD_LIB_STATIC "${GD_LIB}-static") + SET(GD_LIB_STATIC "${GD_LIB}_static") IF(PROFILE) add_definitions("-pg") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 1b2112f..e27467d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -71,12 +71,17 @@ add_library(${GD_LIB} ${LIBGD_SRC_FILES}) add_library(${GD_LIB_STATIC} STATIC ${LIBGD_SRC_FILES}) if (WIN32 AND NOT MINGW AND NOT MSYS) -# SET_TARGET_PROPERTIES(${GD_LIB} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:msvcrt.lib") -SET_PROPERTY(TARGET ${GD_LIB_STATIC} APPEND PROPERTY COMPILE_DEFINITIONS NONDLL=1) + # SET_TARGET_PROPERTIES(${GD_LIB} PROPERTIES LINK_FLAGS "/NODEFAULTLIB:msvcrt.lib") + SET_PROPERTY(TARGET ${GD_LIB_STATIC} APPEND PROPERTY COMPILE_DEFINITIONS NONDLL=1) ENDIF(WIN32 AND NOT MINGW AND NOT MSYS) +if(UNIX) + set_target_properties(${GD_LIB_STATIC} PROPERTIES OUTPUT_NAME ${GD_LIB}) +endif() + if (MINGW OR MSYS) ADD_DEFINITIONS("-mms-bitfields") + set_target_properties(${GD_LIB_STATIC} PROPERTIES OUTPUT_NAME ${GD_LIB}) endif (MINGW OR MSYS) INCLUDE_DIRECTORIES(BEFORE "${PROJECT_BINARY_DIR}" "${CMAKE_BINARY_DIR}" "${GD_SOURCE_DIR}/src") |