summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt5
-rw-r--r--klm/lm/builder/CMakeLists.txt4
2 files changed, 3 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 708ab28f..19e3cfd4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,7 +3,7 @@ project(cdec)
add_definitions(-DKENLM_MAX_ORDER=6 -DHAVE_CONFIG_H)
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
-set(CMAKE_CXX_FLAGS "-Wall -std=c++11 -O3 -g -fPIC")
+set(CMAKE_CXX_FLAGS "-Wall -std=c++11 -O3 -g")
set(METEOR_JAR "" CACHE FILEPATH "Path to meteor.jar")
enable_testing()
@@ -43,9 +43,6 @@ endif(LIBLZMA_FOUND)
# for pycdec
find_package(PythonInterp 2.7 REQUIRED)
-# for pthread
-find_package(Threads REQUIRED)
-
# generate config.h
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
diff --git a/klm/lm/builder/CMakeLists.txt b/klm/lm/builder/CMakeLists.txt
index 5da01261..c04e7889 100644
--- a/klm/lm/builder/CMakeLists.txt
+++ b/klm/lm/builder/CMakeLists.txt
@@ -24,9 +24,9 @@ set(lmplz_SRCS
sort.hh)
add_executable(lmplz ${lmplz_SRCS})
-target_link_libraries(lmplz klm klm_util_double klm_util_stream klm_util ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${LIBLZMA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(lmplz klm klm_util_double klm_util_stream klm_util ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${LIBLZMA_LIBRARIES})
set(dump_counts_SRCS print.cc dump_counts_main.cc)
add_executable(dump_counts ${dump_counts_SRCS})
-target_link_libraries(dump_counts klm klm_util_double klm_util_stream klm_util ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${LIBLZMA_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
+target_link_libraries(dump_counts klm klm_util_double klm_util_stream klm_util ${Boost_LIBRARIES} ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES} ${LIBLZMA_LIBRARIES})