[pkg-d-commits] [ldc] 18/95: cmake does not look for libconfig

[Matthias Klumpp]

This is an automated email from the git hooks/post-receive script.

mak pushed a commit to annotated tag v1.3.0-beta1
in repository ldc.

commit 031003dc68cf3d17659e6a35cf6c7c60d60204e6
Author: Remi THEBAULT <remi.thebault at gmail.com>
Date:   Fri Feb 24 23:31:01 2017 +0100

    cmake does not look for libconfig
---
 CMakeLists.txt                    | 13 ++-----------
 cmake/Modules/FindLibConfig.cmake | 15 ---------------
 2 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18e109c..c831841 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,10 +3,6 @@ project(ldc)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules")
 
-if(MSVC)
-    set(LIBCONFIG_DLL OFF CACHE BOOL "Use libconfig DLL instead of static library")
-endif()
-
 include(FindDCompiler)
 include(CheckIncludeFile)
 include(CheckLibraryExists)
@@ -30,11 +26,6 @@ string(REGEX MATCH "^-.*LLVMTableGen[^;]*;|;-.*LLVMTableGen[^;]*" LLVM_TABLEGEN_
 string(REGEX REPLACE "^-.*LLVMTableGen[^;]*;|;-.*LLVMTableGen[^;]*" "" LLVM_LIBRARIES "${LLVM_LIBRARIES}")
 
 #
-# Locate libconfig.
-#
-find_package(LibConfig REQUIRED)
-
-#
 # Get info about used Linux distribution.
 #
 include(GetLinuxDistribution)
@@ -542,8 +533,8 @@ add_custom_target(${LDC_EXE} ALL DEPENDS ${LDC_EXE_FULL})
 add_custom_target(${LDMD_EXE} ALL DEPENDS ${LDMD_EXE_FULL})
 
 # Figure out how to link the main LDC executable, for which we need to take the
-# libconfig/LLVM flags into account.
-set(LDC_LINKERFLAG_LIST "${SANITIZE_LDFLAGS};${LIBCONFIG_LIBRARY};${LLVM_LIBRARIES};${LLVM_LDFLAGS}")
+# LLVM flags into account.
+set(LDC_LINKERFLAG_LIST "${SANITIZE_LDFLAGS};${LLVM_LIBRARIES};${LLVM_LDFLAGS}")
 
 set(LDC_LINK_MANUALLY OFF)
 if(UNIX AND (CMAKE_COMPILER_IS_GNUCXX OR (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")))
diff --git a/cmake/Modules/FindLibConfig.cmake b/cmake/Modules/FindLibConfig.cmake
deleted file mode 100644
index cf81c43..0000000
--- a/cmake/Modules/FindLibConfig.cmake
+++ /dev/null
@@ -1,15 +0,0 @@
-# - Find the libconfig includes and library
-#
-# This module defines
-# LIBCONFIG_INCLUDE_DIR, where to find libconfig include files, etc.
-# LIBCONFIG_LIBRARY, the library to link against to use libconfig.
-# LIBCONFIG_FOUND, If false, do not try to use libconfig.
-
-find_path(LIBCONFIG_INCLUDE_DIR libconfig.h)
-
-find_library(LIBCONFIG_LIBRARY config)
-
-# Use the default CMake facilities for handling QUIET/REQUIRED.
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LibConfig
-    REQUIRED_VARS LIBCONFIG_INCLUDE_DIR LIBCONFIG_LIBRARY)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-d/ldc.git