Further refinement of CxxTest install with SuperBuild

CMake/SuperBuild.cmake

@@ -10,8 +10,9 @@ else()
 	    GIT_TAG "3.3.3" #"default"
    	    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/eigen
    	    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
-        #CONFIGURE_COMMAND ""
-        #BUILD_COMMAND ""
+		#CONFIGURE_COMMAND ""
+		#BUILD_COMMAND     ""
+		#INSTALL_COMMAND     ""
     )
     
     # Are these necessary?
@@ -53,27 +54,32 @@ if (LEMMA_ENABLE_TESTING)
     if (CXXTEST_FOUND)
         message( STATUS "CxxTest was found" )
     else()
-	    message( STATUS "CxxTest WAS NOT FOUND") 
+	    message( STATUS "CxxTest WAS NOT FOUND")
+        ## CxxTest has no installation per se, it uses python  
 	    ExternalProject_Add(CxxTest
 		    GIT_REPOSITORY "https://github.com/CxxTest/cxxtest.git"
 		    GIT_TAG "master"
 		    UPDATE_COMMAND ""
 		    PATCH_COMMAND ""
-		    CONFIGURE_COMMAND ""
-		    BUILD_COMMAND ""
-		    INSTALL_COMMAND ""
     	    PREFIX ${CMAKE_CURRENT_BINARY_DIR}/external/CxxTest
-    	    CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} /
-                       -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} /
-                       -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+    	    #CMAKE_ARGS -DCXXTEST_INCLUDE_DIR="${CMAKE_CURRENT_BINARY_DIR}/external/CxxTest/src/CxxTest/" 
+            #           -DCXXTEST_PYTHON_TESTGEN_EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/external/CxxTest/src/CxxTest/bin/cxxtestgen"
+            #-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} /
+            #           -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} /
+            #           -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
+		    CONFIGURE_COMMAND ""
+		    BUILD_COMMAND     ""
+		    INSTALL_COMMAND   ""
+	    #set (CXXTEST_INCLUDE_DIR  "${CMAKE_CURRENT_BINARY_DIR}/external/CxxTest/src/CxxTest/" CACHE PATH) #  PATH "" FORCE )
+	    #set (CXXTEST_PYTHON_TESTGEN_EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/external/CxxTest/src/CxxTest/bin/cxxtestgen" CACHE PATH) # PATH "" FORCE )
 	    )
         #enable_testing()
 	    # The values "CACHE PATH "" FORCE" makes the GUI show the values of the local CxxTest, but this can cause issues 
 	    # with users wanting to specify their own path. However, the SuperBuild needs this, in theory you are only here 
-        # because a usable CXXTEST was not already found on the machine, so likely this is sane to do  
-	    set (CXXTEST_INCLUDE_DIR  "${CMAKE_CURRENT_BINARY_DIR}/external/CxxTest/src/CxxTest/" CACHE  PATH "" FORCE )
-	    set (CXXTEST_PYTHON_TESTGEN_EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/external/CxxTest/src/CxxTest/bin/cxxtestgen" CACHE PATH "" FORCE )
-	    find_package(CxxTest REQUIRED)
+        # because a usable CXXTEST was not already found on the machine, so likely this is sane to do 
+	    #set (CXXTEST_INCLUDE_DIR  "${CMAKE_CURRENT_BINARY_DIR}/external/CxxTest/src/CxxTest/"  CACHE PATH "" FORCE )
+	    #set (CXXTEST_PYTHON_TESTGEN_EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/external/CxxTest/src/CxxTest/bin/cxxtestgen" CACHE PATH "" FORCE )
+	    #find_package(CxxTest REQUIRED)
     endif()
 endif()
 

CMakeLists.txt

@@ -36,7 +36,17 @@ endif()
 ## Optional Dependencies
 if (LEMMA_ENABLE_TESTING)
     message (STATUS "LEMMA_ENABLE_TESTING is set" )
-    #find_package (CxxTest QUIET)            # Unit testing 
+    #find_package (CxxTest QUIET)            # Unit testing
+    if (EXISTS  "${CMAKE_CURRENT_BINARY_DIR}/external/CxxTest/src/CxxTest/cxxtest")
+	    set (CXXTEST_INCLUDE_DIR  "${CMAKE_CURRENT_BINARY_DIR}/external/CxxTest/src/CxxTest/" CACHE PATH "" FORCE)
+    else()
+	    set (CXXTEST_INCLUDE_DIR  "CXXTEST_INCLUDE_DIR-NOTFOUND" CACHE PATH "" FORCE)
+    endif()
+    if (EXISTS "${CMAKE_CURRENT_BINARY_DIR}/external/CxxTest/src/CxxTest/bin/cxxtestgen")
+	    set (CXXTEST_PYTHON_TESTGEN_EXECUTABLE "${CMAKE_CURRENT_BINARY_DIR}/external/CxxTest/src/CxxTest/bin/cxxtestgen" CACHE PATH "" FORCE) 
+    else()
+	    set (CXXTEST_PYTHON_TESTGEN_EXECUTABLE "CXXTEST_PYTHON_TESTGEN_EXECUTABLE-NOTFOUND" CACHE PATH "" FORCE) 
+    endif ()
     find_package (CxxTest)            # Unit testing 
     message (STATUS "CXXTEST_FOUND ${CxxTest_FOUND}" )
 endif()
@@ -61,6 +71,9 @@ if ( NOT Eigen3_FOUND OR
   	# execute the superbuild (this script will be invoked again without the
   	# USE_SUPERBUILD option this time)
   	include (CMake/SuperBuild.cmake)
+
+    #add_dependencies(SUPERBUILD CxxTest) 
+
   	return()                      # stop processing this file further
 else()
 	#project (Blah)                # <-- YOUR PROJECT NAME HERE