Changeset 6414

Show
Ignore:
Timestamp:
07/04/08 03:44:48 (2 months ago)
Author:
erijo
Message:

Fixed compilation on mac osx

Location:
branches/newapi/licq/src
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/newapi/licq/src/CMakeLists.txt

    r5950 r6414  
    7171  get_directory_property(${dir} DIRECTORY ${dir} DEFINITION ${dir}_SRCS) 
    7272  foreach (file ${${dir}}) 
    73     get_filename_component(basename ${file} NAME_WE) 
     73    get_filename_component(basename ${file} NAME) 
    7474    list(APPEND objs ${objdir}/${basename}${CMAKE_C_OUTPUT_EXTENSION}) 
    7575  endforeach (file) 
    … …  
    9595 
    9696# External libraries 
    97 target_link_libraries(licq boost_filesystem-mt) 
    98 target_link_libraries(licq boost_program_options-mt) 
     97target_link_libraries(licq ${Boost_FILESYSTEM_LIBRARY}) 
     98target_link_libraries(licq ${Boost_PROGRAM_OPTIONS_LIBRARY}) 
     99target_link_libraries(licq ${Boost_SYSTEM_LIBRARY}) 
     100if (APPLE) 
     101  target_link_libraries(licq intl) 
     102endif (APPLE) 
    99103target_link_libraries(licq ${DLOPEN_LIBRARIES}) 
    100104target_link_libraries(licq ${OPENSSL_LIBRARIES}) 

  • branches/newapi/licq/src/test/CMakeLists.inc

    r5906 r6414  
    1111target_link_libraries(${testname} ${module}) 
    1212target_link_libraries(${testname} testlib) 
    13 target_link_libraries(${testname} boost_unit_test_framework-mt) 
     13target_link_libraries(${testname} ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}) 
     14target_link_libraries(${testname} ${Boost_SYSTEM_LIBRARY}) 
     15if (APPLE) 
     16  target_link_libraries(${testname} intl) 
     17endif (APPLE) 
    1418 
    1519add_test(${module} ${testname})