From f14207a8071f931b5b74305d70d842a36d3b4db6 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 1 Jan 2015 01:30:25 +0000 Subject: [PATCH] libksane: fix some build issues when cmake invoced on top-level directory --- libksane/CMakeLists.txt | 6 ++---- libksane/libksane/CMakeLists.txt | 8 +++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/libksane/CMakeLists.txt b/libksane/CMakeLists.txt index ec4916b7..87f8a23b 100644 --- a/libksane/CMakeLists.txt +++ b/libksane/CMakeLists.txt @@ -9,10 +9,8 @@ IF(NOT KDE4_FOUND) ENDIF(NOT KDE4_FOUND) # Check if sane API is available. -IF (NOT WIN32) - FIND_PACKAGE(Sane) - macro_log_feature(SANE_FOUND "SANE development toolkit" "Scanner Access Now Easy (SANE) development package" "http://www.sane-project.org" TRUE "" "Needed by libksane") -ENDIF (NOT WIN32) +FIND_PACKAGE(Sane) +macro_log_feature(SANE_FOUND "SANE development toolkit" "Scanner Access Now Easy (SANE) development package" "http://www.sane-project.org" TRUE "" "Needed by libksane") ADD_DEFINITIONS (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR} diff --git a/libksane/libksane/CMakeLists.txt b/libksane/libksane/CMakeLists.txt index 41ba6ba0..0798bcff 100644 --- a/libksane/libksane/CMakeLists.txt +++ b/libksane/libksane/CMakeLists.txt @@ -62,11 +62,9 @@ IF (NOT DIGIKAMSC_COMPILE_LIBKSANE) ${CMAKE_CURRENT_BINARY_DIR}/version.h DESTINATION ${INCLUDE_INSTALL_DIR}/libksane COMPONENT Devel) - IF(NOT WIN32) - CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/templates/libksane.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libksane.pc) - CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/cmake/templates/libksane.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libksane.lsm) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libksane.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) - ENDIF(NOT WIN32) + CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/templates/libksane.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libksane.pc) + CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/templates/libksane.lsm.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/libksane.lsm) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libksane.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig ) # Install find cmake script to the system for client applications. -- 2.11.0