Browse Source

Resolve some pthread configuration issues around Luna (#2751)

Don Goodman-Wilson 8 years ago
parent
commit
98528d3ed7
2 changed files with 4 additions and 6 deletions
  1. 3 5
      frameworks/C++/luna/CMakeLists.txt
  2. 1 1
      frameworks/C++/luna/conanfile.txt

+ 3 - 5
frameworks/C++/luna/CMakeLists.txt

@@ -3,19 +3,17 @@ project(lunabench)
 
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
 
 
-find_package( Threads )
-
 include(conanbuildinfo.cmake)
 include(conanbuildinfo.cmake)
 conan_basic_setup()
 conan_basic_setup()
 
 
 set(DEFAULT_SOURCE_FILES default.cpp common.h)
 set(DEFAULT_SOURCE_FILES default.cpp common.h)
 add_executable(lunabench_default ${DEFAULT_SOURCE_FILES})
 add_executable(lunabench_default ${DEFAULT_SOURCE_FILES})
-target_link_libraries(lunabench_default ${CONAN_LIBS} ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(lunabench_default ${CONAN_LIBS})
 
 
 set(EPOLL_SOURCE_FILES epoll.cpp common.h)
 set(EPOLL_SOURCE_FILES epoll.cpp common.h)
 add_executable(lunabench_epoll ${EPOLL_SOURCE_FILES})
 add_executable(lunabench_epoll ${EPOLL_SOURCE_FILES})
-target_link_libraries(lunabench_epoll ${CONAN_LIBS} ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(lunabench_epoll ${CONAN_LIBS})
 
 
 set(THREAD_SOURCE_FILES thread.cpp common.h)
 set(THREAD_SOURCE_FILES thread.cpp common.h)
 add_executable(lunabench_thread ${THREAD_SOURCE_FILES})
 add_executable(lunabench_thread ${THREAD_SOURCE_FILES})
-target_link_libraries(lunabench_thread ${CONAN_LIBS} ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(lunabench_thread ${CONAN_LIBS})

+ 1 - 1
frameworks/C++/luna/conanfile.txt

@@ -1,5 +1,5 @@
 [requires]
 [requires]
-luna/2.10.1@DEGoodmanWilson/stable
+luna/2.11.0@DEGoodmanWilson/stable
 json/2.1.0@jjones646/stable
 json/2.1.0@jjones646/stable
 
 
 [generators]
 [generators]