diff options
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | cmake/FindLibIntl.cmake | 38 |
2 files changed, 4 insertions, 44 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f3d1c2a..0b39b76 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ # The last version with Windows XP support is 3.13, we want to keep that cmake_minimum_required (VERSION 3.10) -project (logdiag VERSION 0.2.1 LANGUAGES C) +project (logdiag VERSION 0.2.1 DESCRIPTION "Schematic editor" LANGUAGES C) # Options option (OPTION_CLANG_TIDY "Enable use of clang-tidy" OFF) @@ -164,8 +164,7 @@ endif () # Generate a configure file add_definitions (-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_36) add_definitions (-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_36) -configure_file (${PROJECT_SOURCE_DIR}/config.h.in - ${PROJECT_BINARY_DIR}/config.h) +configure_file (config.h.in ${PROJECT_BINARY_DIR}/config.h) include_directories (${PROJECT_BINARY_DIR}) # Generate marshallers @@ -210,8 +209,8 @@ include_directories (${GTK3_INCLUDE_DIRS} ${Lua_INCLUDE_DIRS}) set (logdiag_LIBS ${GTK3_LIBRARIES} ${Lua_LIBRARIES} m) if (WIN32) - find_package (LibIntl REQUIRED) - list (APPEND logdiag_LIBS ${LIBINTL_LIBRARIES} shell32) + find_package (Intl REQUIRED) + list (APPEND logdiag_LIBS ${Intl_LIBRARIES} shell32) endif () # Build the library @@ -386,7 +385,6 @@ install (CODE " # DESTDIR is not in use on Windows (WIN32 is only native here!) endif ()") # CPack -set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Schematic editor") set (CPACK_PACKAGE_VENDOR "Premysl Eric Janouch") set (CPACK_PACKAGE_CONTACT "Přemysl Eric Janouch <p@janouch.name>") set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE") diff --git a/cmake/FindLibIntl.cmake b/cmake/FindLibIntl.cmake deleted file mode 100644 index 5e71c49..0000000 --- a/cmake/FindLibIntl.cmake +++ /dev/null @@ -1,38 +0,0 @@ -# - Find libintl -# This module looks for libintl. -# This module defines the following values: -# LIBINTL_FOUND -# LIBINTL_LIBRARIES - -#============================================================================= -# Copyright 2011 Přemysl Eric Janouch -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY -# OF SUCH DAMAGE. -#============================================================================= - -find_library (LIBINTL_LIBRARIES intl) - -include (FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS (LibIntl DEFAULT_MSG LIBINTL_LIBRARIES) - -mark_as_advanced (LIBINTL_LIBRARIES) - |