Merge branch 'master' of https://github.com/open-license-manager/open-licen...

open-license-manager

2014-09-08 897303206e87db7616b8c5f11b894c94b1047e7c

 test/library/CMakeLists.txt

@@ -1,9 +1,8 @@
link_directories ( ${Boost_LIBRARY_DIRS} )

add_executable(
 license_reader_test
 LicenseReader_test.cpp
)
#add_dependencies( license_reader_test boost_filesystem )

target_link_libraries(
 license_reader_test
@@ -11,7 +10,8 @@
 ${Boost_LIBRARIES}
)

SET_TARGET_PROPERTIES(license_reader_test PROPERTIES LINK_SEARCH_START_STATIC ON)
#SET_TARGET_PROPERTIES(license_reader_test PROPERTIES LINK_SEARCH_START_STATIC ON)
#SET_TARGET_PROPERTIES(license_reader_test PROPERTIES LINK_SEARCH_END_STATIC OFF)
ADD_TEST(license_reader_test ${EXECUTABLE_OUTPUT_PATH}/license_reader_test)

IF(WIN32)
@@ -27,7 +27,9 @@
       os
       ${Boost_LIBRARIES}
   )

   SET_TARGET_PROPERTIES(os_linux_test PROPERTIES LINK_SEARCH_START_STATIC ON)
	
   #add_dependencies( os_linux_test )
   #SET_TARGET_PROPERTIES(os_linux_test PROPERTIES LINK_SEARCH_START_STATIC ON)
   ADD_TEST(os_linux_test ${EXECUTABLE_OUTPUT_PATH}/os_linux_test)   
	
ENDIF(WIN32)