Changeset 2986

Timestamp:

11/07/08 04:22:10 (2 months ago)

Author:

kkaempf

Message:

- include CTest and enable testing
- move Find(Swig) before add_subdirectory so the result is available

in subdirs

Files:

• openwsman/trunk/CMakeLists.txt (modified) (3 diffs)

openwsman/trunk/CMakeLists.txt

@@ -7 +7 @@
-cmake_minimum_required(VERSION 2.4)
-
+include(CTest)
+enable_testing()
-#
-# cmake2.6: backward compatibility to cmake 2.4
@@ -141 +143 @@
-ENDIF( BUILD_PERL )
-
+# swig
+
+FIND_PACKAGE(SWIG)
+IF( NOT SWIG_EXECUTABLE)
+  FIND_PROGRAM(SWIG_EXECUTABLE
+    NAMES swig-1.3 swig
+    PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin
+  )
+ENDIF( NOT SWIG_EXECUTABLE)
+
+IF ( NOT SWIG_EXECUTABLE )
+  MESSAGE( STATUS "SWIG not found, skipping bindings." )
+ELSE ( NOT SWIG_EXECUTABLE )
+  MESSAGE( STATUS "SWIG found at ${SWIG_EXECUTABLE}" )
+  ADD_SUBDIRECTORY(bindings)
+ENDIF ( NOT SWIG_EXECUTABLE )
+
-# curl
-
@@ -347 +366 @@
-add_subdirectory(tests)
-
-FIND_PROGRAM(SWIG_EXECUTABLE
-  NAMES swig-1.3 swig
-    PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin)
-IF ( NOT SWIG_EXECUTABLE )
-  MESSAGE( FATAL "SWIG not found." )
-ELSE ( NOT SWIG_EXECUTABLE )
-  MESSAGE( STATUS "SWIG found at ${SWIG_EXECUTABLE}" )
-  ADD_SUBDIRECTORY(bindings)
-ENDIF ( NOT SWIG_EXECUTABLE )
-
-IF ( BUILD_EXAMPLES )