Changeset 301 in pacpusframework for trunk/cmake

Timestamp:

Apr 8, 2014, 10:03:01 AM (11 years ago)

Author:

Marek Kurdej

Message:

Some Unix fixes

Location:

trunk

Files:

• . (modified) (1 prop)
• cmake/PacpusDependencies.cmake (modified) (2 diffs)
• cmake/PacpusUtilities.cmake (modified) (1 diff)

trunk

@@ -1 +1 @@
 build
+CMakeLists.txt.user*

@@ -1 +1 @@
 build
+CMakeLists.txt.user*

trunk/cmake/PacpusDependencies.cmake

@@ -123 +123 @@
     list(APPEND PACPUS_DEPENDENCIES_LIB ${Boost_LIBRARIES})
 endif()
+
 if(PACPUS_USE_LOG)
     find_package(Boost 1.54.0 REQUIRED
@@ -130 +131 @@
             log_setup # log
     )
-    include_directories(${Boost_INCLUDE_DIRS})
-    link_directories(${Boost_LIBRARY_DIRS})
+    list(APPEND PACPUS_DEPENDENCIES_INC ${Boost_INCLUDE_DIRS})
+    list(APPEND PACPUS_DEPENDENCIES_LIB ${Boost_LIBRARIES})
+endif()
+if(PACPUS_BUILD_TESTS)
+    find_package(Boost 1.21.0 REQUIRED
+        COMPONENTS
+            unit_test_framework
+    )
     list(APPEND PACPUS_DEPENDENCIES_INC ${Boost_INCLUDE_DIRS})
     list(APPEND PACPUS_DEPENDENCIES_LIB ${Boost_LIBRARIES})

trunk/cmake/PacpusUtilities.cmake

@@ -378 +378 @@
 endfunction()
 
+################################################################################
+# pacpus_add_test_executable(TEST_NAME SOURCES)
+function(pacpus_add_test_executable TEST_NAME)
+    set(SOURCES ${ARGN})
+    if(DEBUG)
+        message(STATUS "SOURCES = ${SOURCES}")
+    endif()
+    set(EXE_NAME ${TEST_NAME})
+    pacpus_add_executable(${EXE_NAME} ${SOURCES})
+    add_test(
+        NAME ${TEST_NAME}
+        WORKING_DIRECTORY ${PACPUS_INSTALL_DIR}/bin
+        COMMAND ${EXE_NAME}
+    )
+    set_target_properties(${TEST_NAME} PROPERTIES FOLDER "tests")
+    target_link_libraries(${EXE_NAME}
+        ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
+        ${PACPUS_LIBRARIES}
+        ${PACPUS_DEPENDENCIES_LIB}
+        #${QT_LIBRARIES}
+    )
+endfunction()
+
 # ========================================
 # Get sub directories

@@ -1 +1 @@
 build
+CMakeLists.txt.user*