Browse Source

Set -DBUILD_STATIC=off for package builds.

Commit f95272d set the BUILD_STATIC flag on by default, which is unnecessary for package builds.
tags/v1.3.90
Brian P. Hinz 9 years ago
parent
commit
5e3467b8cd

+ 1
- 0
contrib/packages/deb/ubuntu-precise/debian/rules View File

@@ -51,6 +51,7 @@ config-stamp:
-DOPTION_BUILD_EXAMPLES=off \
-DOPTION_USE_SYSTEM_LIBPNG=on;make)
cmake -G"Unix Makefiles" \
-DBUILD_STATIC=off \
-DCMAKE_INSTALL_PREFIX=/usr \
-DFLTK_LIBRARIES="$(CURDIR)/fltk-1.3.2/lib/libfltk.a;$(CURDIR)/fltk-1.3.2/lib/libfltk_images.a;-lpng" \
-DFLTK_INCLUDE_DIR=$(CURDIR)/fltk-1.3.2

+ 1
- 0
contrib/packages/deb/ubuntu-trusty/debian/rules View File

@@ -58,6 +58,7 @@ config-stamp:
./configure --enable-shared=no --enable-cairo --enable-cp936 \
--with-optim="$(CFLAGS) $(XCFLAGS)" --libdir=$(libdir);make)
cmake -G"Unix Makefiles" \
-DBUILD_STATIC=off \
-DCMAKE_INSTALL_PREFIX=/usr \
-DFLTK_LIBRARIES="$(CURDIR)/fltk-1.3.2/lib/libfltk.a;$(CURDIR)/fltk-1.3.2/lib/libfltk_images.a;-lpng" \
-DFLTK_INCLUDE_DIR=$(CURDIR)/fltk-1.3.2

+ 1
- 0
contrib/packages/rpm/el6/SPECS/tigervnc.spec View File

@@ -181,6 +181,7 @@ make %{?_smp_mflags}
popd

%{cmake28} -G"Unix Makefiles" \
-DBUILD_STATIC=off \
-DCMAKE_INSTALL_PREFIX=%{_prefix} \
-DFLTK_LIBRARIES="%{tigervnc_src_dir}/fltk-1.3.2/lib/libfltk.a;%{tigervnc_src_dir}/fltk-1.3.2/lib/libfltk_images.a;-lpng" \
-DFLTK_INCLUDE_DIR=%{tigervnc_src_dir}/fltk-1.3.2

+ 1
- 0
contrib/packages/rpm/sle11/SPECS/tigervnc.spec View File

@@ -275,6 +275,7 @@ popd

# Build all tigervnc
cmake -G"Unix Makefiles" \
-DBUILD_STATIC=off \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DJPEG_INCLUDE_DIR=%{static_lib_buildroot}%{_includedir} \

Loading…
Cancel
Save