ENH: CMake and configure now use SUBDIRS in CMakeLists.txt to find all the directories of the system.

1 files changed, 38 insertions, 20 deletions

diff --git a/CMakeVariables.make.in b/CMakeVariables.make.in
index 07a6f1a..a2b5eeb 100644
--- a/CMakeVariables.make.in
+++ b/CMakeVariables.make.in
@@ -1,11 +1,39 @@
+
+# ***** BEGIN VARIBLES THAT CAN BE OVERRIDDEN IN CMakeLocal.make.in **************
+# CMakeLocal.make.in should be in the directory where you run configure
+# in, which need not be the source directory
+
+# use this to add targets to the default all 
+# so they are built when make is run by default
+LOCAL_BUILD_TARGETS = 
+
+# use this flag to add -L and -l options to the link line
+LOCAL_LINK_FLAGS =
+
+# use this flag to add -I flags to the compile line
+LOCAL_INCLUDE_FLAGS =
+
+# use this flag to add compiler options like -g -O, etc
+# for the "C" compiler, for gcc these default to -g -O2
+USER_CFLAGS   = @CFLAGS@
+
+# use this flag to add compiler options like -g -O, etc
+# for the "C++" compiler, for gcc these default to -g -O2
+USER_CXXFLAGS = @CXXFLAGS@
+
+# ***** END VARIBLES THAT CAN BE OVERRIDDEN IN CMakeLocal.make.in **************
+
+
+# This is the path to the top of the Source tree
 topdir = @fullSrcDir@
 
-CONFIG_DIR = @CMAKE_OBJ_DIR@
+# This is the directory configure was run in
+# where the binaries will be placed
+CMAKE_CONFIG_DIR = @CMAKE_CONFIG_DIR@
 
+# the standard shell for make
 SHELL = /bin/sh
 
-CMAKE_OBJ_DIR = ${CONFIG_DIR}
-
 RANLIB        = @RANLIB@
 CC            = @CC@
 CFLAGS        = @ITK_SHLIB_CFLAGS@ @ANSI_CFLAGS@
@@ -82,31 +110,21 @@ LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
 BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
 
 # set up the path to the rulesgen program
-CMAKE = @CMAKE_OBJ_DIR@/CMake/Source/CMakeBuildTargets
+CMAKE = @CMAKE_CONFIG_DIR@/CMake/Source/CMakeBuildTargets
 KIT_OBJ =  ${SRC_OBJ} ${EXTRA_KIT_OBJ}
 
 
-# ***** BEGIN VARIBLES THAT CAN BE OVERRIDDEN IN CMakeLocal.make.in **************
 
-LOCAL_BUILD_TARGETS = 
-LOCAL_LINK_FLAGS =
-USER_CFLAGS   = @CFLAGS@
-USER_CXXFLAGS = @CXXFLAGS@
-
-# ***** END VARIBLES THAT CAN BE OVERRIDDEN IN CMakeLocal.make.in **************
 
-
-
-# compile line flags
-INCLUDE_FLAGS = -I. \
-	-I${CONFIG_DIR}/Code/Insight3DParty/vxl \
-	-I${CONFIG_DIR} \
-	-I${topdir}/Code/Common \
-	-I${topdir}/Code/Insight3DParty/vxl 
+# C++ compile flags, INCLUDE_FLAGS is set in CMakeTargets.make which
+# is generated by CMakeBuildTargets, see CMake/Source
 
 CXX_FLAGS = ${CPPFLAGS} ${USER_CXXFLAGS} ${CXXFLAGS} \
 	    ${KIT_FLAGS} ${INCLUDE_FLAGS}
 
-CC_FLAGS = ${CPPFLAGS} ${USER_CFLAGS} ${CFLAGS} 
+# C compile flags, INCLUDE_FLAGS is set in CMakeTargets.make which
+# is generated by CMakeBuildTargets, see CMake/Source
+
+CC_FLAGS = ${CPPFLAGS} ${USER_CFLAGS} ${CFLAGS} ${INCLUDE_FLAGS}