Tweak for openmp and for conda

NeoGeographyToolkit · May 18, 2022 · 1e54e31 · 1e54e31
1 parent 23a8216
commit 1e54e31
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/docs/conda_build.rst b/docs/conda_build.rst
@@ -79,7 +79,7 @@ are kept separate.
     conda create -n tools python=3.6
     conda activate tools
     conda install -c conda-forge anaconda-client conda-build \
-      conda-verify cmake git
+      conda-verify
 
 .. _packages_to_build:
 

diff --git a/src/asp/CMakeLists.txt b/src/asp/CMakeLists.txt
@@ -190,12 +190,12 @@ if (NOT APPLE)
   set(OpenMP_gomp_LIBRARY "${ASP_DEPS_DIR}/lib/libgomp${CMAKE_SHARED_LIBRARY_SUFFIX}")
   set(OpenMP_CXX_FLAGS "-fopenmp")
   set(OpenMP_CXX_LIB_NAMES "gomp")
-  find_package(OpenMP REQUIRED)
-  if (OpenMP_FOUND)
-      set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-      set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-      set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
-      endif(OpenMP_FOUND)
+#  find_package(OpenMP REQUIRED) # this fails
+#  if (OpenMP_FOUND)
+  set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+  set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
+# endif(OpenMP_FOUND)
 endif(NOT APPLE)
 
 find_external_library(LAPACK ${ASP_DEPS_DIR} "" "lapack;blas" REQUIRED)