Fix CJUnitTestsPort CTest path

Author: silvakid

test/CJUnitTestsPort/CMakeLists.txt

@@ -49,7 +49,7 @@ ENDIF(MYSQLCPPCONN_TEST_NOT_IMPLEMENTED)
 
 INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}/include/jdbc")
 
-SET(jdbctests_sources
+SET(test_CJUnitTestsPort_sources
   ccpptests.cpp
   BaseTestFixture.cpp
   ../common/stringutils.cpp
@@ -70,8 +70,8 @@ SET(jdbctests_sources
 
 # It's convinient for VS users to have headers as part of project
 IF(WIN32)
-  SET(jdbctests_sources
-        ${jdbctests_sources}
+  SET(test_CJUnitTestsPort_sources
+        ${tests_CJUnitTestsPort_sources}
     BaseTestFixture.h
     ../common/stringutils.h
     resources.h
@@ -90,12 +90,7 @@ IF(WIN32)
     )
 ENDIF(WIN32)
 
-ADD_EXECUTABLE(CJUnitTestsPort ${jdbctests_sources})
-TARGET_LINK_LIBRARIES(CJUnitTestsPort ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
-
-set_target_properties(CJUnitTestsPort PROPERTIES FOLDER "Tests/jdbc")
-
-ADD_TEST(NAME jdbc_CJUnitTestsPort COMMAND CJUnitTestsPort)
+add_unit_test(CJUnitTestsPort)
 
 #Copy sql.properties file to build dir
 file(COPY sql.properties DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

test/CMakeLists.txt

@@ -87,6 +87,29 @@ TARGET_LINK_LIBRARIES(driver_test ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIB
 #TODO: Check if this test should be added since it is failing!
 #ADD_TEST(NAME jdbc_driver_test COMMAND driver_test)
 
+function(add_unit_test NAME)
+
+  if (ARGN)
+    list(GET ARGN 0 TGT_NAME)
+  else()
+    set(TGT_NAME test_${NAME})
+  endif()
+
+  ADD_EXECUTABLE(${TGT_NAME} ${test_${NAME}_sources})
+  SET_TARGET_PROPERTIES(${TGT_NAME} PROPERTIES
+    OUTPUT_NAME "${NAME}"
+    LINK_FLAGS "${MYSQLCPPCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}"
+    COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}"
+    FOLDER "Tests/jdbc"
+  )
+  TARGET_LINK_LIBRARIES(${TGT_NAME} ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
+
+  ADD_TEST(NAME jdbc_test_${NAME} COMMAND $<TARGET_FILE_NAME:${TGT_NAME}>)
+
+  MESSAGE(STATUS "Configuring unit tests - ${NAME}")
+
+endfunction()
+
 MESSAGE(STATUS "Configuring test cases")
 
 add_subdirectory(CJUnitTestsPort)

test/unit/CMakeLists.txt

@@ -104,30 +104,6 @@ IF(MYSQLCPPCONN_TEST_NOT_IMPLEMENTED)
 ENDIF(MYSQLCPPCONN_TEST_NOT_IMPLEMENTED)
 
 
-function(add_unit_test NAME)
-
-  if (ARGN)
-    list(GET ARGN 0 TGT_NAME)
-  else()
-    set(TGT_NAME test_${NAME})
-  endif()
-
-  ADD_EXECUTABLE(${TGT_NAME} ${test_${NAME}_sources})
-  SET_TARGET_PROPERTIES(${TGT_NAME} PROPERTIES
-    OUTPUT_NAME "${NAME}"
-    LINK_FLAGS "${MYSQLCPPCONN_LINK_FLAGS_ENV} ${MYSQL_LINK_FLAGS}"
-    COMPILE_FLAGS "${MYSQLCPPCONN_COMPILE_FLAGS_ENV}"
-    FOLDER "Tests/jdbc"
-  )
-  TARGET_LINK_LIBRARIES(${TGT_NAME} ${MY_TARGET_LINK_LIBRARIES} ${MY_GCOV_LINK_LIBRARIES})
-
-  ADD_TEST(NAME jdbc_test_${NAME} COMMAND $<TARGET_FILE_NAME:${TGT_NAME}>)
-
-  MESSAGE(STATUS "Configuring unit tests - ${NAME}")
-
-endfunction()
-
-
 MESSAGE(STATUS "Configuring unit tests")
 
 ADD_SUBDIRECTORY(example/)