Skip to content

Commit

Permalink
be a little more economic with vertical space
Browse files Browse the repository at this point in the history
  • Loading branch information
nschloe committed Oct 6, 2014
1 parent 21910be commit a12526f
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 25 deletions.
11 changes: 2 additions & 9 deletions package_arch/TribitsAddExecutable.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -297,10 +297,7 @@ FUNCTION(TRIBITS_ADD_EXECUTABLE EXE_NAME)
)

IF(PARSE_ADDED_EXEC_TARGET_NAME_OUT)
SET(
${PARSE_ADDED_EXEC_TARGET_NAME_OUT}
PARENT_SCOPE
)
SET(${PARSE_ADDED_EXEC_TARGET_NAME_OUT} PARENT_SCOPE)
ENDIF()
#
# B) Exclude building the test executable based on some several criteria
Expand Down Expand Up @@ -459,11 +456,7 @@ FUNCTION(TRIBITS_ADD_EXECUTABLE EXE_NAME)
ENDIF()
ADD_EXECUTABLE(${EXE_BINARY_NAME} ${EXE_SOURCES})
IF(PARSE_ADDED_EXEC_TARGET_NAME_OUT)
SET(
${PARSE_ADDED_EXEC_TARGET_NAME_OUT}
${EXE_BINARY_NAME}
PARENT_SCOPE
)
SET(${PARSE_ADDED_EXEC_TARGET_NAME_OUT} ${EXE_BINARY_NAME} PARENT_SCOPE)
ENDIF()
APPEND_GLOBAL_SET(${PARENT_PACKAGE_NAME}_ALL_TARGETS ${EXE_BINARY_NAME})

Expand Down
11 changes: 3 additions & 8 deletions package_arch/TribitsAddTest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -627,10 +627,7 @@ FUNCTION(TRIBITS_ADD_TEST EXE_NAME)
ENDIF()

IF(PARSE_ADDED_TESTS_NAMES_OUT)
SET(
${PARSE_ADDED_TESTS_NAMES_OUT}
PARENT_SCOPE
)
SET(${PARSE_ADDED_TESTS_NAMES_OUT} PARENT_SCOPE)
ENDIF()

#
Expand Down Expand Up @@ -739,8 +736,7 @@ FUNCTION(TRIBITS_ADD_TEST EXE_NAME)
"${EXECUTABLE_PATH}" "${NUM_PROCS_USED}"
${PARSE_RUN_SERIAL} ${INARGS} )
IF(PARSE_ADDED_TESTS_NAMES_OUT)
LIST(APPEND
${PARSE_ADDED_TESTS_NAMES_OUT}
LIST(APPEND ${PARSE_ADDED_TESTS_NAMES_OUT}
${TEST_NAME_INSTANCE}
PARENT_SCOPE
)
Expand Down Expand Up @@ -776,8 +772,7 @@ FUNCTION(TRIBITS_ADD_TEST EXE_NAME)
"${EXECUTABLE_PATH}" "${NUM_PROCS_USED}" ${PARSE_CREATE_WORKING_DIR}
${PARSE_RUN_SERIAL} ${INARGS} )
IF(PARSE_ADDED_TESTS_NAMES_OUT)
LIST(APPEND
${PARSE_ADDED_TESTS_NAMES_OUT}
LIST(APPEND ${PARSE_ADDED_TESTS_NAMES_OUT}
${TEST_NAME_INSTANCE}
PARENT_SCOPE
)
Expand Down
10 changes: 2 additions & 8 deletions package_arch/TribitsLibraryMacros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -394,10 +394,7 @@ FUNCTION(TRIBITS_ADD_LIBRARY LIBRARY_NAME_IN)
ENDIF()

IF(PARSE_ADDED_LIB_TARGET_NAME_OUT)
SET(
${PARSE_ADDED_LIB_TARGET_NAME_OUT}
PARENT_SCOPE
)
SET(${PARSE_ADDED_LIB_TARGET_NAME_OUT} PARENT_SCOPE)
ENDIF()

# ToDo: Deprecate and remove the usage of DEFINES! People should be putting
Expand Down Expand Up @@ -646,10 +643,7 @@ FUNCTION(TRIBITS_ADD_LIBRARY LIBRARY_NAME_IN)

IF(PARSE_ADDED_LIB_TARGET_NAME_OUT)
# Return the library name
SET(
${PARSE_ADDED_LIB_TARGET_NAME_OUT} ${LIBRARY_NAME}
PARENT_SCOPE
)
SET(${PARSE_ADDED_LIB_TARGET_NAME_OUT} ${LIBRARY_NAME} PARENT_SCOPE)
ENDIF()

SET_PROPERTY(
Expand Down

0 comments on commit a12526f

Please sign in to comment.