From af11939e6f75ff3be35c3005fac9b1c9f9fc7541 Mon Sep 17 00:00:00 2001 From: Lars Bilke <lars.bilke@ufz.de> Date: Fri, 17 Jul 2015 10:37:16 +0200 Subject: [PATCH] Fix OGS_NO_EXTERNAL_LIBS=ON build. --- scripts/cmake/Find.cmake | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake index bd2dd5ed3ca..9705a612218 100644 --- a/scripts/cmake/Find.cmake +++ b/scripts/cmake/Find.cmake @@ -66,6 +66,18 @@ find_program(S3CMD_TOOL_PATH s3cmd DOC "S3cmd tool for uploading to Amazon S3") ### Find libraries ### ###################### +## pthread, is a requirement of logog ## +if(CMAKE_CROSSCOMPILING) + set(THREADS_PTHREAD_ARG 0 CACHE STRING "Result from TRY_RUN" FORCE) +endif() +set(CMAKE_THREAD_PREFER_PTHREAD ON) +set(THREADS_PREFER_PTHREAD_FLAG ON) +find_package(Threads REQUIRED) +if(CMAKE_USE_PTHREADS_INIT) + set(HAVE_PTHREADS TRUE) + add_definitions(-DHAVE_PTHREADS) +endif() + # Do not search for libs if this option is set if(OGS_NO_EXTERNAL_LIBS) return() @@ -95,18 +107,6 @@ if(OGS_BUILD_GUI) endif() endif() -## pthread ## -if(CMAKE_CROSSCOMPILING) - set(THREADS_PTHREAD_ARG 0 CACHE STRING "Result from TRY_RUN" FORCE) -endif() -set(CMAKE_THREAD_PREFER_PTHREAD ON) -set(THREADS_PREFER_PTHREAD_FLAG ON) -find_package(Threads REQUIRED) -if(CMAKE_USE_PTHREADS_INIT) - set(HAVE_PTHREADS TRUE) - add_definitions(-DHAVE_PTHREADS) -endif() - # lapack find_package(LAPACK QUIET) -- GitLab