summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore4
-rw-r--r--CMakeLists.txt2
-rw-r--r--misc/pcitool.pc.in1
3 files changed, 6 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index ac8c487..3904ef4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,10 @@ CMakeFiles
cmake_install.cmake
Makefile
*.so.*
+*.so
+*.a
+*.o
+*.mod
install_manifest.txt
apps/xilinx
apps/pio_test
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4d5680f..c33790f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,7 +175,7 @@ include(CPack)
# In releases, we just keep the pre-generated build.h
if(EXISTS ${CMAKE_SOURCE_DIR}/.bzr/ OR NOT EXISTS ${CMAKE_SOURCE_DIR}/pcilib/build.h)
add_custom_target(build
- COMMAND ${CMAKE_COMMAND} -DPCILIB_SOURCE_DIR=${CMAKE_SOURCE_DIR} -DPCILIB_BINARY_DIR=${CMAKE_BINARY_DIR} -P ${CMAKE_SOURCE_DIR}/cmake/build.cmake
+ COMMAND ${CMAKE_COMMAND} -DPCILIB_SOURCE_DIR=${CMAKE_SOURCE_DIR} -DPCILIB_BINARY_DIR=${CMAKE_BINARY_DIR} -DPCILIB_RELEASE=${CPACK_PACKAGE_VERSION} -P ${CMAKE_SOURCE_DIR}/cmake/build.cmake
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
)
add_dependencies(pcilib build)
diff --git a/misc/pcitool.pc.in b/misc/pcitool.pc.in
index d682f75..8243b25 100644
--- a/misc/pcitool.pc.in
+++ b/misc/pcitool.pc.in
@@ -3,6 +3,7 @@ exec_prefix=${CMAKE_INSTALL_BINDIR}
libdir=${CMAKE_INSTALL_LIBDIR}
includedir=${CMAKE_INSTALL_INCLUDEDIR}
plugindir=${PCILIB_PLUGIN_DIR}
+datadir=${PCILIB_DATA_DIR}
modeldir=${PCILIB_MODEL_DIR}
Name: ${TARNAME}