summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2005-06-27 16:44:11 (GMT)
committerKen Martin <ken.martin@kitware.com>2005-06-27 16:44:11 (GMT)
commitcf8c6a30e3fea3047cab29f2a6a37db1b82b0122 (patch)
tree67c0204808f346d4b30cc4a20d91c8d307f49aee
parentb43aaed3bf29f40a91687be8a7da8db131f692e3 (diff)
downloadCMake-cf8c6a30e3fea3047cab29f2a6a37db1b82b0122.zip
CMake-cf8c6a30e3fea3047cab29f2a6a37db1b82b0122.tar.gz
CMake-cf8c6a30e3fea3047cab29f2a6a37db1b82b0122.tar.bz2
ENH: updte to lower case and using ADD_SUBDIRECTORY
-rw-r--r--Example/CMakeLists.txt5
-rw-r--r--Example/Demo/CMakeLists.txt8
-rw-r--r--Example/Hello/CMakeLists.txt2
3 files changed, 8 insertions, 7 deletions
diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt
index 4ebee33..8ee7d72 100644
--- a/Example/CMakeLists.txt
+++ b/Example/CMakeLists.txt
@@ -1,9 +1,10 @@
# The name of our project is "HELLO". CMakeLists files in this project can
# refer to the root source directory of the project as ${HELLO_SOURCE_DIR} and
# to the root binary directory of the project as ${HELLO_BINARY_DIR}.
-PROJECT(HELLO)
+project (HELLO)
# Recurse into the "Hello" and "Demo" subdirectories. This does not actually
# cause another cmake executable to run. The same process will walk through
# the project's entire directory structure.
-SUBDIRS(Hello Demo)
+add_subdirectory (Hello)
+add_subdirectory (Demo)
diff --git a/Example/Demo/CMakeLists.txt b/Example/Demo/CMakeLists.txt
index 6845032..477700f 100644
--- a/Example/Demo/CMakeLists.txt
+++ b/Example/Demo/CMakeLists.txt
@@ -1,12 +1,12 @@
# Make sure the compiler can find include files from our Hello library.
-INCLUDE_DIRECTORIES(${HELLO_SOURCE_DIR}/Hello)
+include_directories (${HELLO_SOURCE_DIR}/Hello)
# Make sure the linker can find the Hello library once it is built.
-LINK_DIRECTORIES(${HELLO_BINARY_DIR}/Hello)
+link_directories (${HELLO_BINARY_DIR}/Hello)
# Add executable called "helloDemo" that is built from the source files
# "demo.cxx" and "demo_b.cxx". The extensions are automatically found.
-ADD_EXECUTABLE(helloDemo demo.cxx demo_b.cxx)
+add_executable (helloDemo demo.cxx demo_b.cxx)
# Link the executable to the Hello library.
-TARGET_LINK_LIBRARIES(helloDemo Hello)
+target_link_libraries (helloDemo Hello)
diff --git a/Example/Hello/CMakeLists.txt b/Example/Hello/CMakeLists.txt
index c424da6..879f4e5 100644
--- a/Example/Hello/CMakeLists.txt
+++ b/Example/Hello/CMakeLists.txt
@@ -1,3 +1,3 @@
# Create a library called "Hello" which includes the source file "hello.cxx".
# The extension is already found. Any number of sources could be listed here.
-ADD_LIBRARY(Hello hello.cxx)
+add_library (Hello hello.cxx)