kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: pass prefix from configure into cmake

This commit is contained in:
Bill Hoffman 2001-09-27 14:58:14 -04:00
parent 15e5c02a74
commit cc768c86c6
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/CMakeLists.txt
View File

@ -1,4 +1,8 @@
INCLUDE (${CMAKE_ROOT}/Modules/FindFLTK.cmake) INCLUDE (${CMAKE_ROOT}/Modules/FindFLTK.cmake)
INCLUDE (${CMAKE_BINARY_DIR}/Source/InitialConfigureFlags.cmake)
IF(CMAKE_CONFIGURE_INSTALL_PREFIX)
SET(CMAKE_INSTALL_PREFIX ${CMAKE_CONFIGURE_INSTALL_PREFIX} )
ENDIF(CMAKE_CONFIGURE_INSTALL_PREFIX)
IF(FLTK_LIBRARY) IF(FLTK_LIBRARY)
IF(FLTK_INCLUDE_PATH) IF(FLTK_INCLUDE_PATH)
@ -84,6 +88,7 @@ IF(BUILD_TESTING)
ENDIF(BUILD_TESTING) ENDIF(BUILD_TESTING)
INSTALL_TARGETS(/bin cmake) INSTALL_TARGETS(/bin cmake)
INSTALL_TARGETS(/bin ctest) INSTALL_TARGETS(/bin ctest)

1
Source/InitialConfigureFlags.cmake.in Normal file
View File

@ -0,0 +1 @@
SET (CMAKE_CONFIGURE_INSTALL_PREFIX @prefix@ CACHE PATH "Install path prefix, prepended onto install directories, For CMake this will always override CMAKE_INSTALL_PREFIX in the cache.")

4
configure vendored
View File

@ -1182,7 +1182,7 @@ done
ac_given_srcdir=$srcdir ac_given_srcdir=$srcdir
trap 'rm -fr `echo "Makefile Source/Makefile Source/cmConfigure.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 trap 'rm -fr `echo "Source/InitialConfigureFlags.cmake Makefile Source/Makefile Source/cmConfigure.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
EOF EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
@ -1263,7 +1263,7 @@ EOF
cat >> $CONFIG_STATUS <<EOF cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"Makefile Source/Makefile"} CONFIG_FILES=\${CONFIG_FILES-"Source/InitialConfigureFlags.cmake Makefile Source/Makefile"}
EOF EOF
cat >> $CONFIG_STATUS <<\EOF cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

2
configure.in
View File

@ -146,7 +146,7 @@ fi
# find make to use to build cmake, prefer gmake # find make to use to build cmake, prefer gmake
AC_PATH_PROGS(RUNMAKE, gmake make) AC_PATH_PROGS(RUNMAKE, gmake make)
AC_OUTPUT(Makefile Source/Makefile) AC_OUTPUT(Source/InitialConfigureFlags.cmake Makefile Source/Makefile)
# build cmake # build cmake
$RUNMAKE $RUNMAKE
# run cmake # run cmake