summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Mi <codeminister@publicstatic.de>2014-01-20 00:08:17 (GMT)
committerGregor Mi <codeminister@publicstatic.de>2014-01-20 01:19:43 (GMT)
commit0db5e64875a0a0e2bd17432704c7d3de89e2dca5 (patch)
treef7931af0ac917630a7aecdd32a86ac4d3271acd1
parent22229f2373c55c74befc1f654854215a9b782862 (diff)
compiles and installs
-rw-r--r--CMakeLists.txt10
-rw-r--r--src/CMakeLists.txt5
2 files changed, 10 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0a2510..b292150 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,17 +48,17 @@ find_package(KF5WidgetsAddons ${KF5_VERSION} REQUIRED)
# ...
-# Subdirectories
-add_subdirectory(src)
-add_subdirectory(autotests)
-add_subdirectory(tests)
-
# TODO: Remove these later
remove_definitions(-DQT_NO_CAST_TO_ASCII)
remove_definitions(-DQT_NO_CAST_FROM_ASCII)
remove_definitions(-DQT_NO_URL_CAST_FROM_STRING)
remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY)
+# Subdirectories
+add_subdirectory(src)
+add_subdirectory(autotests)
+add_subdirectory(tests)
+
# Create a Config.cmake and a ConfigVersion.cmake file and install them
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KSane")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8621571..39f7c65 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,3 +1,8 @@
+include_directories(${SANE_INCLUDE_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}/options
+ ${CMAKE_CURRENT_SOURCE_DIR}/widgets
+)
+
set(ksane_SRCS
widgets/gamma_disp.cpp
widgets/labeled_gamma.cpp