X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=f498110cd3bf46694fe5fffcc0f80860f2f510f0;hb=cd6606c22e9fa9c3b70be856d9ed3843e7793b06;hp=8b7089e8d209e2e3fc75192b26de885dee3a08d1;hpb=5f6061590f1d372d1c79ed78d2000532584e97ac;p=pulseview.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b7089e..f498110 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,13 @@ if(WIN32) set(BOOST_ROOT /usr/local) endif() -find_package(Boost 1.46 COMPONENTS system thread) +if(WIN32) +# On Windows/MinGW the we need to use 'thread_win32' instead of 'thread'. +# The library is named libboost_thread_win32* (not libboost_thread*). +find_package(Boost 1.45 COMPONENTS system thread_win32) +else() +find_package(Boost 1.45 COMPONENTS system thread) +endif() #=============================================================================== #= Config Header @@ -193,7 +199,17 @@ target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS}) #= Installation #------------------------------------------------------------------------------- -install(PROGRAMS ${PROJECT_NAME} DESTINATION bin/) +install(TARGETS ${PROJECT_NAME} DESTINATION bin/) + +#=============================================================================== +#= Packaging (handled by CPack) +#------------------------------------------------------------------------------- + +set(CPACK_PACKAGE_DESCRIPTION_FILE ${CMAKE_CURRENT_SOURCE_DIR}/README) +set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/COPYING) +set(CPACK_SOURCE_IGNORE_FILES ${CMAKE_CURRENT_BINARY_DIR} ".gitignore" ".git") + +include(CPack) #=============================================================================== #= Tests