Correctly handle the case of GNUstep config not existing.

main
theraven 13 years ago
parent 651962702a
commit a5cc173310

@ -211,9 +211,12 @@ endif ()
# #
find_program(GNUSTEP_CONFIG gnustep-config)
if (GNUSTEP_CONFIG)
EXEC_PROGRAM(gnustep-config EXEC_PROGRAM(gnustep-config
ARGS "--installation-domain-for=libobjc2" ARGS "--installation-domain-for=libobjc2"
OUTPUT_VARIABLE DEFAULT_INSTALL_TYPE) OUTPUT_VARIABLE DEFAULT_INSTALL_TYPE)
endif ()
# If we have GNUstep environment variables, then default to installing in the # If we have GNUstep environment variables, then default to installing in the
@ -222,9 +225,9 @@ if (DEFAULT_INSTALL_TYPE)
else () else ()
set(DEFAULT_INSTALL_TYPE "NONE") set(DEFAULT_INSTALL_TYPE "NONE")
endif () endif ()
set(GNUSTEP_INSTALL_TYPE ${DEFAULT_INSTALL_TYPE} CACHE STRING set(GNUSTEP_INSTALL_TYPE ${DEFAULT_INSTALL_TYPE} CACHE STRING
"GNUstep installation type. Options are NONE, SYSTEM, NETWORK or LOCAL.") "GNUstep installation type. Options are NONE, SYSTEM, NETWORK or LOCAL.")
if (${GNUSTEP_INSTALL_TYPE} STREQUAL "NONE") if (${GNUSTEP_INSTALL_TYPE} STREQUAL "NONE")
SET(LIB_INSTALL_PATH lib) SET(LIB_INSTALL_PATH lib)
SET(HEADER_INSTALL_PATH "include") SET(HEADER_INSTALL_PATH "include")
@ -236,6 +239,7 @@ else ()
ARGS "--variable=GNUSTEP_${GNUSTEP_INSTALL_TYPE}_HEADERS" ARGS "--variable=GNUSTEP_${GNUSTEP_INSTALL_TYPE}_HEADERS"
OUTPUT_VARIABLE HEADER_INSTALL_PATH) OUTPUT_VARIABLE HEADER_INSTALL_PATH)
endif () endif ()
message(STATUS "GNUstep install type set to ${GNUSTEP_INSTALL_TYPE}")
install(TARGETS ${INSTALL_TARGETS} install(TARGETS ${INSTALL_TARGETS}
LIBRARY DESTINATION ${LIB_INSTALL_PATH} LIBRARY DESTINATION ${LIB_INSTALL_PATH}

Loading…
Cancel
Save