|
|
@@ -9,12 +9,16 @@ ADD_SUBDIRECTORY(GeneratedHeader)
|
|
|
#
|
|
|
# Lib and exe path
|
|
|
#
|
|
|
+IF(NOT DEFINED bin_dir)
|
|
|
+ SET(bin_dir "bin")
|
|
|
+ENDIF()
|
|
|
+
|
|
|
SET (LIBRARY_OUTPUT_PATH
|
|
|
- "${PROJECT_BINARY_DIR}/bin dir" CACHE INTERNAL
|
|
|
+ ${PROJECT_BINARY_DIR}/${bin_dir} CACHE INTERNAL
|
|
|
"Single output directory for building all libraries.")
|
|
|
|
|
|
SET (EXECUTABLE_OUTPUT_PATH
|
|
|
- "${PROJECT_BINARY_DIR}/bin dir" CACHE INTERNAL
|
|
|
+ ${PROJECT_BINARY_DIR}/${bin_dir} CACHE INTERNAL
|
|
|
"Single output directory for building all executables.")
|
|
|
|
|
|
################################################################
|
|
|
@@ -362,15 +366,16 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/check_command_line.c.in
|
|
|
@ONLY IMMEDIATE)
|
|
|
ADD_EXECUTABLE(check_command_line
|
|
|
${CMAKE_CURRENT_BINARY_DIR}/check_command_line.c)
|
|
|
+SET(output_name "check_command_line")
|
|
|
SET_PROPERTY(TARGET check_command_line
|
|
|
- PROPERTY OUTPUT_NAME "check command line")
|
|
|
+ PROPERTY OUTPUT_NAME ${output_name})
|
|
|
# SET_TARGET_PROPERTIES(check_command_line PROPERTIES
|
|
|
# COMPILE_FLAGS -DCHECK_COMMAND_LINE_VERBOSE)
|
|
|
ADD_CUSTOM_COMMAND(
|
|
|
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/command_line_check
|
|
|
COMMAND ${CMAKE_COMMAND} -DMARK_FILE=${CMAKE_CURRENT_BINARY_DIR}/check_mark.txt
|
|
|
-P ${CMAKE_CURRENT_SOURCE_DIR}/check_mark.cmake
|
|
|
- COMMAND "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/check command line"
|
|
|
+ COMMAND ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/${output_name}
|
|
|
${CHECK_ARGS} ""
|
|
|
VERBATIM
|
|
|
COMMENT "Checking custom command line escapes (single'quote)"
|
|
|
@@ -380,7 +385,7 @@ SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_BINARY_DIR}/command_line_check
|
|
|
ADD_CUSTOM_TARGET(do_check_command_line ALL
|
|
|
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/command_line_check
|
|
|
COMMAND ${CMAKE_COMMAND} -E echo "Checking custom target command escapes"
|
|
|
- COMMAND "${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/check command line"
|
|
|
+ COMMAND ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/${output_name}
|
|
|
${CHECK_ARGS} ""
|
|
|
VERBATIM
|
|
|
COMMENT "Checking custom target command line escapes ($dollar-signs$)"
|