浏览代码

ENH: pass prefix from configure into cmake

Bill Hoffman 24 年之前
父节点
当前提交
cc768c86c6
共有 4 个文件被更改,包括 9 次插入3 次删除
  1. 5 0
      Source/CMakeLists.txt
  2. 1 0
      Source/InitialConfigureFlags.cmake.in
  3. 2 2
      configure
  4. 1 1
      configure.in

+ 5 - 0
Source/CMakeLists.txt

@@ -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 - 0
Source/InitialConfigureFlags.cmake.in

@@ -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.")

+ 2 - 2
configure

@@ -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

+ 1 - 1
configure.in

@@ -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