diff options
| -rw-r--r-- | Modules/CMakeDetermineCCompiler.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeDetermineCXXCompiler.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeDetermineJavaCompiler.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeDetermineSystem.cmake | 2 | ||||
| -rw-r--r-- | Modules/CMakeSystemSpecificInformation.cmake | 8 | ||||
| -rw-r--r-- | Modules/CheckFunctionExists.cmake | 4 | ||||
| -rw-r--r-- | Modules/CheckIncludeFile.cmake | 8 | ||||
| -rw-r--r-- | Modules/CheckIncludeFileCXX.cmake | 8 | ||||
| -rw-r--r-- | Modules/CheckLibraryExists.cmake | 4 | ||||
| -rw-r--r-- | Modules/CheckSizeOf.cmake | 4 | ||||
| -rw-r--r-- | Modules/CheckVariableExists.cmake | 4 | ||||
| -rw-r--r-- | Modules/TestBigEndian.cmake | 4 | ||||
| -rw-r--r-- | Modules/TestCXXAcceptsFlag.cmake | 4 | ||||
| -rw-r--r-- | Modules/TestForANSIForScope.cmake | 2 | ||||
| -rw-r--r-- | Modules/TestForSTDNamespace.cmake | 2 |
15 files changed, 30 insertions, 30 deletions
diff --git a/Modules/CMakeDetermineCCompiler.cmake b/Modules/CMakeDetermineCCompiler.cmake index 4b766a2..31dd08e 100644 --- a/Modules/CMakeDetermineCCompiler.cmake +++ b/Modules/CMakeDetermineCCompiler.cmake @@ -56,5 +56,5 @@ ENDIF(NOT CMAKE_COMPILER_RETURN) # configure variables set in this file for fast reload later on CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeCCompiler.cmake.in - ${PROJECT_BINARY_DIR}/CMakeCCompiler.cmake IMMEDIATE) + ${CMAKE_BINARY_DIR}/CMakeCCompiler.cmake IMMEDIATE) MARK_AS_ADVANCED(CMAKE_AR CMAKE_C_COMPILER_FULLPATH) diff --git a/Modules/CMakeDetermineCXXCompiler.cmake b/Modules/CMakeDetermineCXXCompiler.cmake index 05c095e..d4ddae4 100644 --- a/Modules/CMakeDetermineCXXCompiler.cmake +++ b/Modules/CMakeDetermineCXXCompiler.cmake @@ -48,5 +48,5 @@ ENDIF(NOT CMAKE_COMPILER_RETURN) # configure all variables set in this file CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeCXXCompiler.cmake.in - ${PROJECT_BINARY_DIR}/CMakeCXXCompiler.cmake IMMEDIATE) + ${CMAKE_BINARY_DIR}/CMakeCXXCompiler.cmake IMMEDIATE) MARK_AS_ADVANCED(CMAKE_CXX_COMPILER_FULLPATH) diff --git a/Modules/CMakeDetermineJavaCompiler.cmake b/Modules/CMakeDetermineJavaCompiler.cmake index d1034aa..2e556e4 100644 --- a/Modules/CMakeDetermineJavaCompiler.cmake +++ b/Modules/CMakeDetermineJavaCompiler.cmake @@ -71,5 +71,5 @@ MARK_AS_ADVANCED(CMAKE_JAVA_COMPILER) # configure variables set in this file for fast reload later on CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeJavaCompiler.cmake.in - ${PROJECT_BINARY_DIR}/CMakeJavaCompiler.cmake IMMEDIATE @ONLY) + ${CMAKE_BINARY_DIR}/CMakeJavaCompiler.cmake IMMEDIATE @ONLY) MARK_AS_ADVANCED(CMAKE_AR CMAKE_JAVA_COMPILER_FULLPATH) diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake index 79ff941..7fa674d 100644 --- a/Modules/CMakeDetermineSystem.cmake +++ b/Modules/CMakeDetermineSystem.cmake @@ -63,5 +63,5 @@ ENDIF(CMAKE_SYSTEM_VERSION) # configure variables set in this file for fast reload CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CMakeSystem.cmake.in - ${PROJECT_BINARY_DIR}/CMakeSystem.cmake IMMEDIATE) + ${CMAKE_BINARY_DIR}/CMakeSystem.cmake IMMEDIATE) diff --git a/Modules/CMakeSystemSpecificInformation.cmake b/Modules/CMakeSystemSpecificInformation.cmake index 04aaa17..845dd07 100644 --- a/Modules/CMakeSystemSpecificInformation.cmake +++ b/Modules/CMakeSystemSpecificInformation.cmake @@ -45,12 +45,12 @@ ELSE(EXISTS ${CMAKE_SYSTEM_INFO_FILE}) MESSAGE("System is unknown to cmake, create:\n${CMAKE_SYSTEM_INFO_FILE}" " to use this system, please send your config file to " "cmake@www.cmake.org so it can be added to cmake"") - IF(EXISTS ${PROJECT_BINARY_DIR}/CMakeCache.txt) - CONFIGURE_FILE(${PROJECT_BINARY_DIR}/CMakeCache.txt - ${PROJECT_BINARY_DIR}/CopyOfCMakeCache.txt COPYONLY) + IF(EXISTS ${CMAKE_BINARY_DIR}/CMakeCache.txt) + CONFIGURE_FILE(${CMAKE_BINARY_DIR}/CMakeCache.txt + ${CMAKE_BINARY_DIR}/CopyOfCMakeCache.txt COPYONLY) MESSAGE("You CMakeCache.txt file was copied to CopyOfCMakeCache.txt. " "Please send that file to cmake@www.cmake.org.") - ENDIF(EXISTS ${PROJECT_BINARY_DIR}/CMakeCache.txt) + ENDIF(EXISTS ${CMAKE_BINARY_DIR}/CMakeCache.txt) ENDIF(EXISTS ${CMAKE_SYSTEM_INFO_FILE}) # 3. include optional systemname-compiler.cmake files diff --git a/Modules/CheckFunctionExists.cmake b/Modules/CheckFunctionExists.cmake index e435745..1ab1ad3 100644 --- a/Modules/CheckFunctionExists.cmake +++ b/Modules/CheckFunctionExists.cmake @@ -11,7 +11,7 @@ MACRO(CHECK_FUNCTION_EXISTS FUNCTION VARIABLE) SET(MACRO_CHECK_FUNCTION_DEFINITIONS -DCHECK_FUNCTION_EXISTS=${FUNCTION}) MESSAGE(STATUS "Looking for ${FUNCTION}") TRY_COMPILE(${VARIABLE} - ${PROJECT_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_ROOT}/Modules/CheckFunctionExists.c CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_FUNCTION_DEFINITIONS} OUTPUT_VARIABLE OUTPUT) @@ -21,7 +21,7 @@ MACRO(CHECK_FUNCTION_EXISTS FUNCTION VARIABLE) ELSE(${VARIABLE}) MESSAGE(STATUS "Looking for ${FUNCTION} - not found") SET(${VARIABLE} "" CACHE INTERNAL "Have function ${FUNCTION}") - WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log + WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log "Determining if the function ${FUNCTION} exists failed with the following output:\n" "${OUTPUT}\n" APPEND) ENDIF(${VARIABLE}) diff --git a/Modules/CheckIncludeFile.cmake b/Modules/CheckIncludeFile.cmake index 4db9953..03551dc 100644 --- a/Modules/CheckIncludeFile.cmake +++ b/Modules/CheckIncludeFile.cmake @@ -10,11 +10,11 @@ MACRO(CHECK_INCLUDE_FILE INCLUDE VARIABLE) IF("${VARIABLE}" MATCHES "^${VARIABLE}$") SET(CHECK_INCLUDE_FILE_VAR ${INCLUDE}) CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CheckIncludeFile.c.in - ${PROJECT_BINARY_DIR}/CMakeTmp/CheckIncludeFile.c IMMEDIATE) + ${CMAKE_BINARY_DIR}/CMakeTmp/CheckIncludeFile.c IMMEDIATE) MESSAGE(STATUS "Looking for ${INCLUDE}") TRY_COMPILE(${VARIABLE} - ${PROJECT_BINARY_DIR} - ${PROJECT_BINARY_DIR}/CMakeTmp/CheckIncludeFile.c + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/CMakeTmp/CheckIncludeFile.c OUTPUT_VARIABLE OUTPUT) IF(${VARIABLE}) MESSAGE(STATUS "Looking for ${INCLUDE} - found") @@ -22,7 +22,7 @@ MACRO(CHECK_INCLUDE_FILE INCLUDE VARIABLE) ELSE(${VARIABLE}) MESSAGE(STATUS "Looking for ${INCLUDE} - not found.") SET(${VARIABLE} "" CACHE INTERNAL "Have include ${INCLUDE}") - WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log + WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log "Determining if the include file ${INCLUDE} " "exists failed with the following output:\n" "${OUTPUT}\n" APPEND) diff --git a/Modules/CheckIncludeFileCXX.cmake b/Modules/CheckIncludeFileCXX.cmake index 5b2a77c..75ab187 100644 --- a/Modules/CheckIncludeFileCXX.cmake +++ b/Modules/CheckIncludeFileCXX.cmake @@ -11,10 +11,10 @@ MACRO(CHECK_INCLUDE_FILE_CXX INCLUDE VARIABLE) MESSAGE(STATUS "Checking for CXX include file ${INCLUDE}") SET(CHECK_INCLUDE_FILE_VAR ${INCLUDE}) CONFIGURE_FILE(${CMAKE_ROOT}/Modules/CheckIncludeFile.cxx.in - ${PROJECT_BINARY_DIR}/CMakeTmp/CheckIncludeFile.cxx IMMEDIATE) + ${CMAKE_BINARY_DIR}/CMakeTmp/CheckIncludeFile.cxx IMMEDIATE) TRY_COMPILE(${VARIABLE} - ${PROJECT_BINARY_DIR} - ${PROJECT_BINARY_DIR}/CMakeTmp/CheckIncludeFile.cxx + ${CMAKE_BINARY_DIR} + ${CMAKE_BINARY_DIR}/CMakeTmp/CheckIncludeFile.cxx CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CMAKE_ANSI_CXXFLAGS} OUTPUT_VARIABLE OUTPUT) IF(${VARIABLE}) @@ -23,7 +23,7 @@ MACRO(CHECK_INCLUDE_FILE_CXX INCLUDE VARIABLE) ELSE(${VARIABLE}) MESSAGE(STATUS "Checking for CXX include file ${INCLUDE} -- not found") SET(${VARIABLE} "" CACHE INTERNAL "Have include ${INCLUDE}") - WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log + WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log "Determining if the include file ${INCLUDE} " "exists failed with the following output:\n" "${OUTPUT}\n" APPEND) diff --git a/Modules/CheckLibraryExists.cmake b/Modules/CheckLibraryExists.cmake index ccca0f5..ea92fab 100644 --- a/Modules/CheckLibraryExists.cmake +++ b/Modules/CheckLibraryExists.cmake @@ -11,7 +11,7 @@ MACRO(CHECK_LIBRARY_EXISTS LIBRARY FUNCTION LOCATION VARIABLE) SET(MACRO_CHECK_LIBRARY_EXISTS_DEFINITION -DCHECK_FUNCTION_EXISTS=${FUNCTION}) MESSAGE(STATUS "Looking for ${FUNCTION} in ${LIBRARY}") TRY_COMPILE(${VARIABLE} - ${PROJECT_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_ROOT}/Modules/CheckFunctionExists.c CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_LIBRARY_EXISTS_DEFINITION} @@ -25,7 +25,7 @@ MACRO(CHECK_LIBRARY_EXISTS LIBRARY FUNCTION LOCATION VARIABLE) ELSE(${VARIABLE}) MESSAGE(STATUS "Looking for ${FUNCTION} in ${LIBRARY} - not found") SET(${VARIABLE} "" CACHE INTERNAL "Have library ${LIBRARY}") - WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log + WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log "Determining if the function ${FUNCTION} exists in the ${LIBRARY} " "failed with the following output:\n" "${OUTPUT}\n" APPEND) diff --git a/Modules/CheckSizeOf.cmake b/Modules/CheckSizeOf.cmake index 65481ca..b4a880c 100644 --- a/Modules/CheckSizeOf.cmake +++ b/Modules/CheckSizeOf.cmake @@ -18,7 +18,7 @@ MACRO(CHECK_TYPE_SIZE TYPE VARIABLE) ENDIF(HAVE_STDINT_H) MESSAGE(STATUS "Check size of ${TYPE}") TRY_RUN(${VARIABLE} HAVE_${VARIABLE} - ${PROJECT_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_ROOT}/Modules/CheckSizeOf.c CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_TYPE_SIZE_FLAGS} OUTPUT_VARIABLE OUTPUT) @@ -26,7 +26,7 @@ MACRO(CHECK_TYPE_SIZE TYPE VARIABLE) MESSAGE(STATUS "Check size of ${TYPE} - done") ELSE(HAVE_${VARIABLE}) MESSAGE(STATUS "Check size of ${TYPE} - failed") - WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log + WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log "Determining size of ${TYPE} failed with the following output:\n${OUTPUT}\n" APPEND) ENDIF(HAVE_${VARIABLE}) diff --git a/Modules/CheckVariableExists.cmake b/Modules/CheckVariableExists.cmake index 9eaf73b..b6e3a78 100644 --- a/Modules/CheckVariableExists.cmake +++ b/Modules/CheckVariableExists.cmake @@ -9,7 +9,7 @@ MACRO(CHECK_VARIABLE_EXISTS VAR VARIABLE) IF("${VARIABLE}" MATCHES "^${VARIABLE}$") SET(MACRO_CHECK_VARIABLE_DEFINITIONS -DCHECK_VARIABLE_EXISTS=${VAR}) TRY_COMPILE(${VARIABLE} - ${PROJECT_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_ROOT}/Modules/CheckVariableExists.c CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${MACRO_CHECK_VARIABLE_DEFINITIONS} OUTPUT_VARIABLE OUTPUT) @@ -17,7 +17,7 @@ MACRO(CHECK_VARIABLE_EXISTS VAR VARIABLE) SET(${VARIABLE} 1 CACHE INTERNAL "Have variable ${VAR}") ELSE(${VARIABLE}) SET(${VARIABLE} "" CACHE INTERNAL "Have variable ${VAR}") - WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log + WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log "Determining if the variable ${VAR} exists failed with the following output:\n" "${OUTPUT}\n" APPEND) ENDIF(${VARIABLE}) diff --git a/Modules/TestBigEndian.cmake b/Modules/TestBigEndian.cmake index 2be59e3..a244060 100644 --- a/Modules/TestBigEndian.cmake +++ b/Modules/TestBigEndian.cmake @@ -6,11 +6,11 @@ MACRO(TEST_BIG_ENDIAN VARIABLE) TRY_RUN(${VARIABLE} HAVE_${VARIABLE} - ${PROJECT_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_ROOT}/Modules/TestBigEndian.c OUTPUT_VARIABLE OUTPUT) IF(NOT HAVE_${VARIABLE}) - WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log + WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log "Determining the endianes of the system failed with the following output:\n${OUTPUT}\n" APPEND) ENDIF(NOT HAVE_${VARIABLE}) diff --git a/Modules/TestCXXAcceptsFlag.cmake b/Modules/TestCXXAcceptsFlag.cmake index 09cf4b2..019d289 100644 --- a/Modules/TestCXXAcceptsFlag.cmake +++ b/Modules/TestCXXAcceptsFlag.cmake @@ -9,14 +9,14 @@ MACRO(CHECK_CXX_ACCEPTS_FLAG FLAGS VARIABLE) MESSAGE(STATUS "Checking to see if CXX compiler acepts flag ${FLAGS}") TRY_COMPILE(${VARIABLE} - ${PROJECT_BINARY_DIR} + ${CMAKE_BINARY_DIR} ${CMAKE_ROOT}/Modules/DummyCXXFile.cxx CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${FLAGS} OUTPUT_VARIABLE OUTPUT) IF(${VARIABLE}) MESSAGE(STATUS "Checking to see if CXX compiler acepts flag ${FLAGS} - yes") ELSE(${VARIABLE}) - WRITE_FILE(${PROJECT_BINARY_DIR}/CMakeError.log + WRITE_FILE(${CMAKE_BINARY_DIR}/CMakeError.log "Determining if the CXX compiler accepts the flag ${FLAGS} failed with the following output:\n" "${OUTPUT}\n" APPEND) ENDIF(${VARIABLE}) ENDMACRO(CHECK_CXX_ACCEPTS_FLAG) diff --git a/Modules/TestForANSIForScope.cmake b/Modules/TestForANSIForScope.cmake index 58d78ee..0192062 100644 --- a/Modules/TestForANSIForScope.cmake +++ b/Modules/TestForANSIForScope.cmake @@ -6,7 +6,7 @@ IF(NOT CMAKE_ANSI_FOR_SCOPE) MESSAGE(STATUS "Check for ANSI scope") - TRY_COMPILE(CMAKE_ANSI_FOR_SCOPE ${PROJECT_BINARY_DIR} + TRY_COMPILE(CMAKE_ANSI_FOR_SCOPE ${CMAKE_BINARY_DIR} ${CMAKE_ROOT}/Modules/TestForAnsiForScope.cxx CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CMAKE_ANSI_CXXFLAGS}) IF (CMAKE_ANSI_FOR_SCOPE) diff --git a/Modules/TestForSTDNamespace.cmake b/Modules/TestForSTDNamespace.cmake index 285ff4f..1bb8106 100644 --- a/Modules/TestForSTDNamespace.cmake +++ b/Modules/TestForSTDNamespace.cmake @@ -6,7 +6,7 @@ IF(NOT CMAKE_STD_NAMESPACE) MESSAGE(STATUS "Check for STD namespace") - TRY_COMPILE(CMAKE_STD_NAMESPACE ${PROJECT_BINARY_DIR} + TRY_COMPILE(CMAKE_STD_NAMESPACE ${CMAKE_BINARY_DIR} ${CMAKE_ROOT}/Modules/TestForSTDNamespace.cxx CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CMAKE_ANSI_CXXFLAGS}) IF (CMAKE_STD_NAMESPACE) |