Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
CMake
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2,684
Issues
2,684
List
Boards
Labels
Milestones
Merge Requests
16
Merge Requests
16
Packages
Packages
Container Registry
External Wiki
External Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
CMake
CMake
Commits
cc768c86
Commit
cc768c86
authored
Sep 27, 2001
by
Bill Hoffman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ENH: pass prefix from configure into cmake
parent
15e5c02a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
3 deletions
+9
-3
Source/CMakeLists.txt
Source/CMakeLists.txt
+5
-0
Source/InitialConfigureFlags.cmake.in
Source/InitialConfigureFlags.cmake.in
+1
-0
configure
configure
+2
-2
configure.in
configure.in
+1
-1
No files found.
Source/CMakeLists.txt
View file @
cc768c86
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_INCLUDE_PATH
)
...
...
@@ -84,6 +88,7 @@ IF(BUILD_TESTING)
ENDIF
(
BUILD_TESTING
)
INSTALL_TARGETS
(
/bin cmake
)
INSTALL_TARGETS
(
/bin ctest
)
Source/InitialConfigureFlags.cmake.in
0 → 100644
View file @
cc768c86
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.")
configure
View file @
cc768c86
...
...
@@ -1182,7 +1182,7 @@ done
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
cat
>>
$CONFIG_STATUS
<<
EOF
...
...
@@ -1263,7 +1263,7 @@ EOF
cat
>>
$CONFIG_STATUS
<<
EOF
CONFIG_FILES=
\$
{CONFIG_FILES-"Makefile Source/Makefile"}
CONFIG_FILES=
\$
{CONFIG_FILES-"
Source/InitialConfigureFlags.cmake
Makefile Source/Makefile"}
EOF
cat
>>
$CONFIG_STATUS
<<
\
EOF
for ac_file in ..
$CONFIG_FILES
; do if test "x
$ac_file
" != x..; then
...
...
configure.in
View file @
cc768c86
...
...
@@ -146,7 +146,7 @@ fi
# find make to use to build cmake, prefer gmake
AC_PATH_PROGS(RUNMAKE, gmake make)
AC_OUTPUT(Makefile Source/Makefile)
AC_OUTPUT(
Source/InitialConfigureFlags.cmake
Makefile Source/Makefile)
# build cmake
$RUNMAKE
# run cmake
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment