From: Duncan Mac-Vicar P Date: Fri, 26 Oct 2007 16:50:05 +0000 (+0000) Subject: - install the libraries X-Git-Tag: BASE-SuSE-Code-12_1-Branch~308^2~879 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0dad7d6272bf23aa28a4f77fa1006ec8af15d3aa;p=thirdparty%2Flibsolv.git - install the libraries --- diff --git a/package/libsatsolver.spec.in b/package/libsatsolver.spec.in index 7f14ec58..a425cd2c 100644 --- a/package/libsatsolver.spec.in +++ b/package/libsatsolver.spec.in @@ -35,7 +35,7 @@ Group: Development/Languages/Ruby %build mkdir build cd build -cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \ +cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DLIB=%{_lib} \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DCMAKE_C_FLAGS_RELEASE:STRING="%{optflags}" \ @@ -66,7 +66,7 @@ rm -rf "$RPM_BUILD_ROOT" %doc doc/THEORY %doc doc/PLANNING %dir %{_includedir}/satsolver -#%{_includedir}/satsolver/* +%{_includedir}/satsolver/* %files ruby %defattr(-,root,root,-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e1453702..a582bf83 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -4,5 +4,7 @@ evr.c pool.c queue.c source.c util.c) ADD_LIBRARY(satsolver STATIC ${libsatsolver_SRCS}) -#SET(libsatsolver_HEADERS bitmap.h evr.h hash.h poolarch.h pool.h poolid.h pooltypes.h queue.h solvable.h solver.h source.h source_solv.h util.h ) -#INSTALL( FILES ${libsatsolver_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/satsolver" ) +SET(libsatsolver_HEADERS bitmap.h evr.h hash.h poolarch.h pool.h poolid.h pooltypes.h queue.h solvable.h solver.h source.h source_solv.h util.h ) + +INSTALL( FILES ${libsatsolver_HEADERS} DESTINATION "${CMAKE_INSTALL_PREFIX}/include/satsolver" ) +INSTALL(TARGETS satsolver LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) \ No newline at end of file