fix SCL_ENABLE_COVERAGE

mpictor · mpictor · commit 2236a5be2377 · 2012-08-01T18:57:24.000-04:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -116,16 +116,6 @@ IF(_orig_lang)
   SET(ENV{LANG}        C)
 ENDIF(_orig_lang)
 
-#---------------------------------------------------------------------
-# Testing option
-OPTION_WITH_DEFAULT( SCL_ENABLE_TESTING "Enable unittesting framework" OFF )
-IF(SCL_ENABLE_TESTING)
-  if( NOT DEFINED SCL_BUILD_SCHEMAS )
-    set( SCL_BUILD_SCHEMAS "ALL" ) #test all schemas, unless otherwise specified
-  endif()
-  INCLUDE(CTest)
-  ENABLE_TESTING()
-ENDIF(SCL_ENABLE_TESTING)
 
 #---------------------------------------------------------------------
 # Coverage option
@@ -141,6 +131,17 @@ IF(SCL_ENABLE_COVERAGE)
   SET(SCL_BUILD_TYPE "Debug" CACHE STRING "Build type required by testing framework" FORCE)
 ENDIF(SCL_ENABLE_COVERAGE)
 
+#---------------------------------------------------------------------
+# Testing option
+OPTION_WITH_DEFAULT( SCL_ENABLE_TESTING "Enable unittesting framework" OFF )
+IF(SCL_ENABLE_TESTING)
+  if( NOT DEFINED SCL_BUILD_SCHEMAS )
+    set( SCL_BUILD_SCHEMAS "ALL" ) #test all schemas, unless otherwise specified
+  endif()
+  INCLUDE(CTest)
+  ENABLE_TESTING()
+ENDIF(SCL_ENABLE_TESTING)
+
 #---------------------------------------------------------------------
 # The following logic is what allows binaries to run successfully in
 # the build directory AND install directory.  Thanks to plplot for
diff --git a/cmake/SCL_Utils.cmake b/cmake/SCL_Utils.cmake
@@ -107,7 +107,7 @@ MACRO(SCL_ADDLIB libname srcs libs)
       add_library(${static_name} STATIC ${srcslist})
       DEFINE_DLL_EXPORTS(${static_name})
       if(NOT ${libs} MATCHES "NONE")
-          target_link_libraries(${static_name} "${libslist}")
+          target_link_libraries(${static_name} ${libslist})
           DEFINE_DLL_IMPORTS(${static_name} ${libslist} )
       endif(NOT ${libs} MATCHES "NONE")
       IF(NOT WIN32)
