Quellcode durchsuchen

Try to correct build scripts

bel vor 9 Jahren
Ursprung
Commit
be79d1e5f9
1 geänderte Dateien mit 12 neuen und 12 gelöschten Zeilen
  1. 12 12
      test/CMakeLists.txt

+ 12 - 12
test/CMakeLists.txt

@@ -102,19 +102,19 @@ target_link_libraries(exe-c-unit-tests c-library ${CHECK_LIBRARIES})
 add_dependencies(exe-c-unit-tests check-unit-test-framework)
 
 #add_executable(main-c-unit-test main.c)
-#target_link_libraries(main-c-unit-test
-#  shared-c-unit-tests
-#  public-func-c-unit-tests
-#  public-server-c-unit-tests
-#  private-c-unit-tests
-#  exe-c-unit-tests
-#  ${CHECK_LIBRARIES})
-#add_dependencies(main-c-unit-test check-unit-test-framework)
+target_link_libraries(main-c-unit-test
+  shared-c-unit-tests
+  public-func-c-unit-tests
+  public-server-c-unit-tests
+  private-c-unit-tests
+  exe-c-unit-tests
+  ${CHECK_LIBRARIES})
+add_dependencies(main-c-unit-test check-unit-test-framework)
 
 # Add a check command that builds the dependent test program
-#add_custom_target(check
-#  COMMAND ${CMAKE_CTEST_COMMAND}
-#  DEPENDS main-c-unit-test)
+add_custom_target(check
+  COMMAND ${CMAKE_CTEST_COMMAND}
+  DEPENDS main-c-unit-test)
 
 # A macro for adding tests
 macro(civetweb_add_test suite test_case)
@@ -180,7 +180,7 @@ if (${CMAKE_BUILD_TYPE} MATCHES "[Cc]overage")
       COMMAND ${LCOV_EXECUTABLE} -q -a before.lcov -a after.lcov --output-file final.lcov
       COMMAND ${LCOV_EXECUTABLE} -q -r final.lcov "'${CMAKE_SOURCE_DIR}/test/*'" -o final.lcov
       COMMAND ${GENHTML_EXECUTABLE} final.lcov -o lcov --demangle-cpp --sort -p "${CMAKE_SOURCE_DIR}" -t benchmark
-#      DEPENDS main-c-unit-test
+      DEPENDS main-c-unit-test
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       COMMENT "Running LCOV"
     )