Changeset 313 in pacpusframework

Timestamp:

07/28/14 16:35:46 (10 years ago)

Author:

Marek Kurdej

Message:

Separated projects: FileLib and TestFileLib.

Location:

trunk

Files:

• cmake/PacpusUtilities.cmake (modified) (1 diff)
• src/FileLib/CMakeLists.txt (modified) (1 diff)
• src/FileLib/test/CMakeLists.txt (copied) (copied from trunk/src/FileLib/CMakeLists.txt ) (4 diffs, 1 prop)

trunk/cmake/PacpusUtilities.cmake

@@ -464 +464 @@
         )
 endfunction(CREATE_EXPORT)
+
+function(UNDEF_EXPORT PLUGIN_NAME)
+    string(TOUPPER ${PLUGIN_NAME} PLUGIN_NAME_UPPER)
+    add_definitions( -U${PLUGIN_NAME_UPPER}_EXPORTS )
+endfunction(IMPORT)

trunk/src/FileLib/CMakeLists.txt

@@ -60 +60 @@
 
 if(${PACPUS_BUILD_TESTS})
-    link_directories(
-        ${PROJECT_BINARY_DIR}/../FileLib
-    )
-    pacpus_add_test_executable(Test${PROJECT_NAME}
-        test/TestFileLib.cpp
-        ${HDRS}
-    )
-    list(APPEND LIBS
-        optimized ${PROJECT_NAME} debug ${PROJECT_NAME}_d
-    )
-    target_link_libraries(Test${PROJECT_NAME}
-        ${LIBS}
-    )
-    pacpus_install(Test${PROJECT_NAME})
-    install(DIRECTORY test/data
-        DESTINATION ${PACPUS_INSTALL_DIR}/bin
-    )
+    add_subdirectory(test)
 endif()
 
 ################################################################################
-# Install
+# INSTALL
 pacpus_install(${PROJECT_NAME})
 

trunk/src/FileLib/test/CMakeLists.txt

@@ -7 +7 @@
 #                                               #
 #################################################
-project(FileLib)
+project(TestFileLib)
 
 ################################################################################
-create_export(EXPORT_HDR ${PROJECT_NAME} "${PACPUS_INCLUDE_DIR}/Pacpus/kernel")
+# necessary because TestFileLib is a subdirectory of FileLib and all definitions
+# are inherited
+undef_export(FileLib)
 
 ################################################################################
 # DIRECTORIES
 link_directories(
-    ${PROJECT_BINARY_DIR}/../PacpusLib
+    ${PROJECT_BINARY_DIR}/../../FileLib
+    ${PROJECT_BINARY_DIR}/../../PacpusLib
 )
 
@@ -21 +24 @@
 # FILES
 set(SRCS
-    src/DbiteException.cpp
-    src/DbiteFile.cpp
+    TestFileLib.cpp
 )
 
 set(HDRS
-    ${EXPORT_HDR}
-
-    ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/DbiteException.h
     ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/DbiteFile.h
-    ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/DbiteFileTypes.h
     ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/FileLibConfig.h
-    ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/hdfile_header_t.h
-    ${PACPUS_INCLUDE_DIR}/Pacpus/kernel/road_time.h
 )
 
 ################################################################################
 # BUILD and LINK
-pacpus_add_library(${PROJECT_NAME} SHARED
+pacpus_add_test_executable(${PROJECT_NAME}
     ${SRCS}
     ${HDRS}
@@ -50 +46 @@
 if(WIN32)
     list(APPEND LIBS
+        optimized FileLib debug FileLib_d
         optimized PacpusLib debug PacpusLib_d
     )
@@ -59 +56 @@
 )
 
-if(${PACPUS_BUILD_TESTS})
-    link_directories(
-        ${PROJECT_BINARY_DIR}/../FileLib
-    )
-    pacpus_add_test_executable(Test${PROJECT_NAME}
-        test/TestFileLib.cpp
-        ${HDRS}
-    )
-    list(APPEND LIBS
-        optimized ${PROJECT_NAME} debug ${PROJECT_NAME}_d
-    )
-    target_link_libraries(Test${PROJECT_NAME}
-        ${LIBS}
-    )
-    pacpus_install(Test${PROJECT_NAME})
-    install(DIRECTORY test/data
-        DESTINATION ${PACPUS_INSTALL_DIR}/bin
-    )
-endif()
-
 ################################################################################
-# Install
+# INSTALL
 pacpus_install(${PROJECT_NAME})
+install(DIRECTORY data
+    DESTINATION ${PACPUS_INSTALL_DIR}/bin
+)
 
 ################################################################################
 # FOLDER
-pacpus_folder(${PROJECT_NAME} "libraries")
+pacpus_folder(${PROJECT_NAME} "tests")