OSDN Git Service

libksane: fix some build issues when cmake invoced on top-level directory
authorIvailo Monev <xakepa10@gmail.com>
Thu, 1 Jan 2015 01:30:25 +0000 (01:30 +0000)
committerIvailo Monev <xakepa10@gmail.com>
Thu, 1 Jan 2015 01:30:25 +0000 (01:30 +0000)
libksane/CMakeLists.txt
libksane/libksane/CMakeLists.txt

index ec4916b..87f8a23 100644 (file)
@@ -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}
index 41ba6ba..0798bcf 100644 (file)
@@ -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.