Improve the locations so the destination is correct as well as the include path.

This commit is contained in:
Weston Schmidt 2016-02-15 06:36:21 -08:00
parent 2cac21e156
commit a5c60cd223

View File

@ -33,12 +33,12 @@ add_library(${PROJ_CJSON_UTILS}.shared SHARED ${HEADERS_UTILS} ${SOURCES_UTILS})
set_target_properties(${PROJ_CJSON_UTILS}.shared PROPERTIES OUTPUT_NAME cJSON_utils) set_target_properties(${PROJ_CJSON_UTILS}.shared PROPERTIES OUTPUT_NAME cJSON_utils)
target_link_libraries(${PROJ_CJSON_UTILS}.shared ${PROJ_CJSON}.shared) target_link_libraries(${PROJ_CJSON_UTILS}.shared ${PROJ_CJSON}.shared)
install (TARGETS ${PROJ_CJSON} DESTINATION bin) install (TARGETS ${PROJ_CJSON} DESTINATION lib${LIB_SUFFIX})
install (TARGETS ${PROJ_CJSON}.shared DESTINATION bin) install (TARGETS ${PROJ_CJSON}.shared DESTINATION lib${LIB_SUFFIX})
install (FILES cJSON.h DESTINATION include) install (FILES cJSON.h DESTINATION include/cJSON)
install (TARGETS ${PROJ_CJSON_UTILS} DESTINATION bin) install (TARGETS ${PROJ_CJSON_UTILS} DESTINATION lib${LIB_SUFFIX})
install (TARGETS ${PROJ_CJSON_UTILS}.shared DESTINATION bin) install (TARGETS ${PROJ_CJSON_UTILS}.shared DESTINATION lib${LIB_SUFFIX})
install (FILES cJSON_Utils.h DESTINATION include) install (FILES cJSON_Utils.h DESTINATION include/cJSON)
option(ENABLE_CJSON_TEST "Enable building cJSON test" OFF) option(ENABLE_CJSON_TEST "Enable building cJSON test" OFF)
if(ENABLE_CJSON_TEST) if(ENABLE_CJSON_TEST)