ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Remove flex.exe and its license file from the tarball.

Просмотр исходного кода 
cmr:v1.4
cmr:v1.5

This commit was SVN r22469.
Этот коммит содержится в:
Shiqing Fan 2010-01-22 16:40:13 +00:00
родитель 08fbd6c644
Коммит c29a668e37
4 изменённых файлов: 19 добавлений и 28 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
contrib/Makefile.am
Просмотреть файл

@ -73,8 +73,6 @@ EXTRA_DIST = \
platform/lanl/tlcc/optimized-nopanasas.conf \
platform/lanl/tlcc/optimized-panasas \
platform/lanl/tlcc/optimized-panasas.conf \
platform/win32/bin/flex.exe \
platform/win32/bin/COPYING.flex \
platform/win32/CMakeModules/check_bool.cmake \
platform/win32/CMakeModules/check_c_inline.cmake \
platform/win32/CMakeModules/check_c_type_exists.cmake \

8
contrib/platform/win32/CMakeModules/find_flex.cmake
Просмотреть файл

@ -27,8 +27,10 @@ MACRO(FIND_FLEX)
IF(FLEX_EXECUTABLE_SYS)
SET(FLEX_EXECUTABLE ${FLEX_EXECUTABLE_SYS} CACHE FILEPATH "Flex")
ELSE(FLEX_EXECUTABLE_SYS)
# in case that no flex is installed, use our own version
SET(FLEX_EXECUTABLE "${CMAKE_SOURCE_DIR}/contrib/platform/win32/bin/flex.exe" CACHE FILEPATH "Flex")
IF(EXISTS ${CMAKE_SOURCE_DIR}/contrib/platform/win32/bin/flex.exe)
# in case that no flex is installed, use our own version
SET(FLEX_EXECUTABLE "${CMAKE_SOURCE_DIR}/contrib/platform/win32/bin/flex.exe" CACHE FILEPATH "Flex")
ENDIF(EXISTS ${CMAKE_SOURCE_DIR}/contrib/platform/win32/bin/flex.exe)
ENDIF(FLEX_EXECUTABLE_SYS)
ELSE(WIN32)
# nothing to do here at moment.
@ -49,7 +51,7 @@ MACRO(FIND_FLEX)
ENDIF(NOT Flex_FIND_QUIETLY)
ELSE(FLEX_FOUND)
IF(Flex_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Check for working flex...failed")
MESSAGE(STATUS "Check for working flex...failed")
ENDIF(Flex_FIND_REQUIRED)
ENDIF(FLEX_FOUND)
ENDIF(NOT FLEX_FOUND)

21
opal/CMakeLists.txt
Просмотреть файл

@ -84,19 +84,16 @@ FOREACH(OPAL_SUBDIR ${OPAL_SUBDIRS})
ENDFOREACH(OPAL_SUBDIR ${OPAL_SUBDIRS})
# Generate flex files.
ADD_FLEX_FILE(OPAL_SOURCE_FILES ./util/keyval/keyval_lex.l opal_util_keyval_yy "${PROJECT_BINARY_DIR}/util/keyval/")
ADD_FLEX_FILE(OPAL_SOURCE_FILES ./util/show_help_lex.l opal_show_help_yy "${PROJECT_BINARY_DIR}/util/")
#only generate if it's not a tarball
IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/util/keyval/keyval_lex.c)
ADD_FLEX_FILE(OPAL_SOURCE_FILES ./util/keyval/keyval_lex.l
opal_util_keyval_yy "${PROJECT_BINARY_DIR}/util/keyval/")
ENDIF(NOT EXISTS ${PROJECT_SOURCE_DIR}/util/keyval/keyval_lex.c)
# Exclude the same flex files that generaged on Linux,
# which could be found in a tarball.
IF(EXISTS ${PROJECT_SOURCE_DIR}/util/keyval/keyval_lex.c)
LIST(REMOVE_ITEM OPAL_SOURCE_FILES "${PROJECT_SOURCE_DIR}/util/keyval/keyval_lex.c")
ENDIF(EXISTS ${PROJECT_SOURCE_DIR}/util/keyval/keyval_lex.c)
IF(EXISTS ${PROJECT_SOURCE_DIR}/util/keyval/show_help_lex.c)
LIST(REMOVE_ITEM OPAL_SOURCE_FILES "${PROJECT_SOURCE_DIR}/util/keyval/show_help_lex.c")
ENDIF(EXISTS ${PROJECT_SOURCE_DIR}/util/keyval/show_help_lex.c)
IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/util/show_help_lex.c)
ADD_FLEX_FILE(OPAL_SOURCE_FILES ./util/show_help_lex.l
opal_show_help_yy "${PROJECT_BINARY_DIR}/util/")
ENDIF(NOT EXISTS ${PROJECT_SOURCE_DIR}/util/show_help_lex.c)
# Add source files from mca subdirectories.

16
orte/CMakeLists.txt
Просмотреть файл

@ -37,17 +37,11 @@ FOREACH(ORTE_SUBDIR ${ORTE_SUBDIRS})
ENDFOREACH(ORTE_SUBDIR ${ORTE_SUBDIRS})
# Generate flex files.
ADD_FLEX_FILE(ORTE_SOURCE_FILES "./util/hostfile/hostfile_lex.l" "orte_util_hostfile_"
"${PROJECT_BINARY_DIR}/util/hostfile/")
SET_SOURCE_FILES_PROPERTIES(${PROJECT_BINARY_DIR}/util/hostfile/hostfile_lex.c
PROPERTIES COMPILE_DEFINITIONS YY_NO_UNISTD_H)
# Exclude the same flex files that generaged on Linux,
# which could be found in a tarball.
IF(EXISTS ${PROJECT_SOURCE_DIR}/util/hostfile/hostfile_lex.c)
LIST(REMOVE_ITEM ORTE_SOURCE_FILES "${PROJECT_SOURCE_DIR}/util/hostfile/hostfile_lex.c")
ENDIF(EXISTS ${PROJECT_SOURCE_DIR}/util/hostfile/hostfile_lex.c)
#only generate if it's not a tarball
IF(NOT EXISTS ${PROJECT_SOURCE_DIR}/util/hostfile/hostfile_lex.c)
ADD_FLEX_FILE(ORTE_SOURCE_FILES ./util/hostfile/hostfile_lex.l "orte_util_hostfile_"
"${PROJECT_BINARY_DIR}/util/hostfile/")
ENDIF(NOT EXISTS ${PROJECT_SOURCE_DIR}/util/hostfile/hostfile_lex.c)
INCLUDE (check_mca_subdirs)