Use BFD instead BDF to identify CMake variable related to BinaryFileDescriptor

Libs/Core/CMake/TestBFD/CMakeLists.txt

@@ -3,12 +3,12 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 PROJECT(TestBFD)
 
 # Sanity checks
-IF("${BDF_LIBRARY_NAME}" STREQUAL "")
+IF("${BFD_LIBRARY_NAME}" STREQUAL "")
   MESSAGE(FATAL_ERROR "error: ${v} variable is an empty string !")
 ENDIF()
 
-UNSET(BDF_LIBRARY CACHE)
-FIND_LIBRARY(BDF_LIBRARY ${BDF_LIBRARY_NAME})
+UNSET(BFD_LIBRARY CACHE)
+FIND_LIBRARY(BFD_LIBRARY ${BFD_LIBRARY_NAME})
 
 ADD_EXECUTABLE(TestBFD TestBFD.cpp)
-TARGET_LINK_LIBRARIES(TestBFD ${BDF_LIBRARY})
+TARGET_LINK_LIBRARIES(TestBFD ${BFD_LIBRARY})

Libs/Core/CMake/ctkMacroBFDCheck.cmake

@@ -16,7 +16,7 @@ ENDIF()
 SET(BFD_LIBRARIES)
 UNSET(HAVE_BFD CACHE)
 
-SET(TestBFD_BUILD_LOG "${CMAKE_CURRENT_BINARY_DIR}/CMake/TestBDF-build-log.txt")
+SET(TestBFD_BUILD_LOG "${CMAKE_CURRENT_BINARY_DIR}/CMake/TestBFD-build-log.txt")
 
 if(CTK_LIB_Core_WITH_BFD_STATIC OR CTK_LIB_Core_WITH_BFD_SHARED)
   IF(WIN32)
@@ -27,16 +27,16 @@ if(CTK_LIB_Core_WITH_BFD_STATIC OR CTK_LIB_Core_WITH_BFD_SHARED)
     INCLUDE(CheckIncludeFile)
     CHECK_INCLUDE_FILE(bfd.h HAVE_BFD_HEADER)
 
-    SET(BDF_LIBRARY_NAME libbfd.a)
+    SET(BFD_LIBRARY_NAME libbfd.a)
     SET(TestBFD_LIBRARY_MODE STATIC)
     IF(CTK_LIB_Core_WITH_BFD_SHARED)
-      SET(BDF_LIBRARY_NAME libbfd${CMAKE_SHARED_LIBRARY_SUFFIX})
+      SET(BFD_LIBRARY_NAME libbfd${CMAKE_SHARED_LIBRARY_SUFFIX})
       SET(TestBFD_LIBRARY_MODE SHARED)
     ENDIF()
-    UNSET(BDF_LIBRARY CACHE)
-    FIND_LIBRARY(BDF_LIBRARY ${BDF_LIBRARY_NAME})
+    UNSET(BFD_LIBRARY CACHE)
+    FIND_LIBRARY(BFD_LIBRARY ${BFD_LIBRARY_NAME})
 
-    IF(HAVE_BFD_HEADER AND BDF_LIBRARY)
+    IF(HAVE_BFD_HEADER AND BFD_LIBRARY)
       # make sure we can build with libbfd
       #MESSAGE(STATUS "Checking libbfd")
       TRY_COMPILE(HAVE_BFD
@@ -46,13 +46,13 @@ if(CTK_LIB_Core_WITH_BFD_STATIC OR CTK_LIB_Core_WITH_BFD_SHARED)
         CMAKE_FLAGS
         -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
-        -DBDF_LIBRARY_NAME:STRING=${BDF_LIBRARY_NAME}
+        -DBFD_LIBRARY_NAME:STRING=${BFD_LIBRARY_NAME}
         OUTPUT_VARIABLE OUTPUT)
       FILE(WRITE ${TestBFD_BUILD_LOG} ${OUTPUT})
       #MESSAGE(${OUTPUT})
 
       IF(HAVE_BFD)
-        SET(BFD_LIBRARIES ${BDF_LIBRARY})
+        SET(BFD_LIBRARIES ${BFD_LIBRARY})
       ENDIF()
     ENDIF()
   ENDIF()