Skip to content

Commit

Permalink
Add rpmmacros file and patches
Browse files Browse the repository at this point in the history
  • Loading branch information
hazedine committed May 2, 2012
1 parent 1efcba7 commit d8b71ff
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 36 deletions.
21 changes: 21 additions & 0 deletions centos/.rpmmacros
@@ -0,0 +1,21 @@
%_topdir %(echo $HOME)/rpmbuild

%_cmake_lib_suffix64 -DLIB_SUFFIX=64
%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON
%_cmake_version 2.8.7
%__cmake /usr/bin/cmake

%cmake \
CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
%__cmake \\\
-DCMAKE_VERBOSE_MAKEFILE=ON \\\
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
-DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
%if "%{?_lib}" == "lib64" \
%{?_cmake_lib_suffix64} \\\
%endif \
%{?_cmake_skip_rpath} \\\
-DBUILD_SHARED_LIBS:BOOL=ON

@@ -1,34 +1,15 @@
--- minc-toolkit-config.unix.csh.cmake.orig 2012-04-23 16:56:42.961279089 -0400
+++ minc-toolkit-config.unix.csh.cmake 2012-04-23 16:57:15.557310177 -0400
@@ -1,23 +1,23 @@
# minc-toolkit configuration parameters for @MINC_TOOLKIT_VERSION_FULL@
+++ minc-toolkit-config.unix.csh.cmake 2012-05-01 15:20:17.522833201 -0400
@@ -10,14 +10,14 @@
endif

setenv MINC_TOOLKIT_VERSION "@MINC_TOOLKIT_VERSION_FULL@"
-setenv PATH @CMAKE_INSTALL_PREFIX@/bin:@CMAKE_INSTALL_PREFIX@/pipeline:${PATH}
+#setenv PATH @CMAKE_INSTALL_PREFIX@/bin:@CMAKE_INSTALL_PREFIX@/pipeline:${PATH}

-if ( ! ${?PERL5LIB} ) then
-setenv PERL5LIB @CMAKE_INSTALL_PREFIX@/perl:@CMAKE_INSTALL_PREFIX@/pipeline
-else
-setenv PERL5LIB @CMAKE_INSTALL_PREFIX@/perl:@CMAKE_INSTALL_PREFIX@/pipeline:${PERL5LIB}
-endif
-
-if ( ! ${?LD_LIBRARY_PATH} ) then
if ( ! ${?LD_LIBRARY_PATH} ) then
-setenv LD_LIBRARY_PATH @CMAKE_INSTALL_PREFIX@/lib:@CMAKE_INSTALL_PREFIX@/lib/InsightToolkit
-else
+setenv LD_LIBRARY_PATH @CMAKE_INSTALL_PREFIX@/lib
else
-setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:@CMAKE_INSTALL_PREFIX@/lib:@CMAKE_INSTALL_PREFIX@/lib/InsightToolkit
-endif
+#if ( ! ${?PERL5LIB} ) then
+#setenv PERL5LIB @CMAKE_INSTALL_PREFIX@/perl:@CMAKE_INSTALL_PREFIX@/pipeline
+#else
+#setenv PERL5LIB @CMAKE_INSTALL_PREFIX@/perl:@CMAKE_INSTALL_PREFIX@/pipeline:${PERL5LIB}
+#endif
+
+#if ( ! ${?LD_LIBRARY_PATH} ) then
+#setenv LD_LIBRARY_PATH @CMAKE_INSTALL_PREFIX@/lib:@CMAKE_INSTALL_PREFIX@/lib/InsightToolkit
+#else
+#setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:@CMAKE_INSTALL_PREFIX@/lib:@CMAKE_INSTALL_PREFIX@/lib/InsightToolkit
+#endif
+setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:@CMAKE_INSTALL_PREFIX@/lib
endif


setenv MNI_DATAPATH @CMAKE_INSTALL_PREFIX@/share
Expand Down
@@ -1,15 +1,11 @@
--- minc-toolkit-config.unix.sh.cmake.orig 2012-04-23 16:55:51.992963157 -0400
+++ minc-toolkit-config.unix.sh.cmake 2012-04-23 16:56:21.500588670 -0400
@@ -1,10 +1,10 @@
# minc-toolkit configuration parameters for @MINC_TOOLKIT_VERSION_FULL@

+++ minc-toolkit-config.unix.sh.cmake 2012-05-01 15:21:00.020225931 -0400
@@ -3,8 +3,8 @@
export MINC_TOOLKIT_VERSION="@MINC_TOOLKIT_VERSION_FULL@"
-export PATH=@CMAKE_INSTALL_PREFIX@/bin:@CMAKE_INSTALL_PREFIX@/pipeline:${PATH}
-export PERL5LIB=@CMAKE_INSTALL_PREFIX@/perl:@CMAKE_INSTALL_PREFIX@/pipeline:${PERL5LIB}
export PATH=@CMAKE_INSTALL_PREFIX@/bin:@CMAKE_INSTALL_PREFIX@/pipeline:${PATH}
export PERL5LIB=@CMAKE_INSTALL_PREFIX@/perl:@CMAKE_INSTALL_PREFIX@/pipeline:${PERL5LIB}
-export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:@CMAKE_INSTALL_PREFIX@/lib:@CMAKE_INSTALL_PREFIX@/lib/InsightToolkit
+#export PATH=@CMAKE_INSTALL_PREFIX@/bin:@CMAKE_INSTALL_PREFIX@/pipeline:${PATH}
+#export PERL5LIB=@CMAKE_INSTALL_PREFIX@/perl:@CMAKE_INSTALL_PREFIX@/pipeline:${PERL5LIB}
+#export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:@CMAKE_INSTALL_PREFIX@/lib:@CMAKE_INSTALL_PREFIX@/lib/InsightToolkit
+export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:@CMAKE_INSTALL_PREFIX@/lib
export MNI_DATAPATH=@CMAKE_INSTALL_PREFIX@/share
-export MINC_FORCE_V2=1
-export MINC_COMPRESS=4
Expand Down

0 comments on commit d8b71ff

Please sign in to comment.