Changeset 966:c8fce9beb46a in lemon-main for CMakeLists.txt

Timestamp:

12/20/11 19:25:40 (12 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

958:9a716871028e (diff), 965:a1fd7008a052 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merge head merging

File:

• CMakeLists.txt (modified) (2 diffs)

CMakeLists.txt

@@ -115 +115 @@
 SET(LEMON_HAVE_LONG_LONG ${HAVE_LONG_LONG})
 
-INCLUDE(FindPythonInterp)
-
 ENABLE_TESTING()
 
@@ -127 +125 @@
 ADD_SUBDIRECTORY(lemon)
 IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
+  ADD_SUBDIRECTORY(contrib)
   ADD_SUBDIRECTORY(demo)
   ADD_SUBDIRECTORY(tools)