kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix modules for recent changes

Browse Source
This commit is contained in:
Andy Cedilnik 2002-09-25 10:08:08 -04:00
parent 561a3da204
commit 5902279ebc
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Modules/CheckFunctionExists.cmake
View File

@ -7,10 +7,11 @@
# #
MACRO(CHECK_FUNCTION_EXISTS FUNCTION VARIABLE) MACRO(CHECK_FUNCTION_EXISTS FUNCTION VARIABLE)
SET(MACRO_CHECK_FUNCTION_DEFINITIONS -DCHECK_FUNCTION_EXISTS=${FUNCTION})
TRY_COMPILE(${VARIABLE} TRY_COMPILE(${VARIABLE}
${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}
${CMAKE_ROOT}/Modules/CheckFunctionExists.c ${CMAKE_ROOT}/Modules/CheckFunctionExists.c
COMPILE_DEFINITIONS -DCHECK_FUNCTION_EXISTS=${FUNCTION} CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS}
OUTPUT_VARIABLE OUTPUT) OUTPUT_VARIABLE OUTPUT)
IF(NOT ${VARIABLE}) IF(NOT ${VARIABLE})
WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log

23
Modules/CheckLibraryExists.cmake
View File

@ -7,21 +7,20 @@
# #
MACRO(CHECK_LIBRARY_EXISTS LIBRARY FUNCTION LOCATION VARIABLE) MACRO(CHECK_LIBRARY_EXISTS LIBRARY FUNCTION LOCATION VARIABLE)
SET(CHECK_LIBRARY_EXISTS_LIBRARY ${LIBRARY}) SET(MACRO_CHECK_LIBRARY_EXISTS_DEFINITION -DCHECK_FUNCTION_EXISTS=${FUNCTION})
SET(CHECK_LIBRARY_EXISTS_FUNCTION ${FUNCTION})
SET(CHECK_LIBRARY_EXISTS_LOCATION ${LOCATION})
SET(CHECK_LIBRARY_EXISTS_VARIABLE ${VARIABLE})
SET(CHECK_LIBRARY_EXISTS_SOURCE ${CMAKE_ROOT}/Modules/CheckFunctionExists.c)
CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CheckLibraryExists.lists.in
${PROJECT_BINARY_DIR}/CMakeTmp/CheckLibraryExists/CMakeLists.txt
IMMEDIATE)
TRY_COMPILE(${VARIABLE} TRY_COMPILE(${VARIABLE}
${PROJECT_BINARY_DIR}/CMakeTmp/CheckLibraryExists ${PROJECT_BINARY_DIR}/CheckIfLibraryExists
${PROJECT_BINARY_DIR}/CMakeTmp/CheckLibraryExists ${CMAKE_ROOT}/Modules/CheckFunctionExists.c
CHECK_LIBRARY_EXISTS OUTPUT_VARIABLE OUTPUT) CMAKE_FLAGS
-DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_LIBRARY_EXISTS_DEFINITION}
-DLINK_DIRECTORIES:STRING=${LOCATION}
-DLINK_LIBRARIES:STRING=${LIBRARY}
OUTPUT_VARIABLE OUTPUT)
IF(NOT ${VARIABLE}) IF(NOT ${VARIABLE})
WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log
"Determining if the function ${FUNCTION} exists failed with the following output:\n" "Determining if the function ${FUNCTION} exists in the ${LIBRARY} failed with the following output:\n"
"${OUTPUT}\n") "${OUTPUT}\n")
ENDIF(NOT ${VARIABLE}) ENDIF(NOT ${VARIABLE})
ENDMACRO(CHECK_LIBRARY_EXISTS) ENDMACRO(CHECK_LIBRARY_EXISTS)

2
Modules/CheckSizeOf.cmake
View File

@ -18,7 +18,7 @@ MACRO(CHECK_TYPE_SIZE TYPE VARIABLE)
TRY_RUN(${VARIABLE} HAVE_${VARIABLE} TRY_RUN(${VARIABLE} HAVE_${VARIABLE}
${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}
${CMAKE_ROOT}/Modules/CheckSizeOf.c ${CMAKE_ROOT}/Modules/CheckSizeOf.c
COMPILE_DEFINITIONS ${MACRO_CHECK_TYPE_SIZE_FLAGS} CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_TYPE_SIZE_FLAGS}
OUTPUT_VARIABLE OUTPUT) OUTPUT_VARIABLE OUTPUT)
IF(NOT HAVE_${VARIABLE}) IF(NOT HAVE_${VARIABLE})
WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log