Explorar o código

Add PCILIB_DATA_DIR to pictool.pc

Suren A. Chilingaryan hai 1 ano
pai
achega
2df3a4efe6
Modificáronse 3 ficheiros con 6 adicións e 1 borrados
  1. 4 0
      .gitignore
  2. 1 1
      CMakeLists.txt
  3. 1 0
      misc/pcitool.pc.in

+ 4 - 0
.gitignore

@@ -18,6 +18,10 @@ CMakeFiles
 cmake_install.cmake
 Makefile
 *.so.*
+*.so
+*.a
+*.o
+*.mod
 install_manifest.txt
 apps/xilinx
 apps/pio_test

+ 1 - 1
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)

+ 1 - 0
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}