diff options
| -rw-r--r-- | openmp/runtime/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | openmp/runtime/cmake/config-ix.cmake | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/openmp/runtime/CMakeLists.txt b/openmp/runtime/CMakeLists.txt index 641b8f4631b..a4c7690bd28 100644 --- a/openmp/runtime/CMakeLists.txt +++ b/openmp/runtime/CMakeLists.txt @@ -323,12 +323,12 @@ set(LIBOMP_LIB_NAME ${LIBOMP_DEFAULT_LIB_NAME} CACHE STRING "Base OMP library na if(${LIBOMP_ENABLE_SHARED}) set(LIBOMP_LIBRARY_SUFFIX ${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(LIBOMP_LIBRARY_KIND SHARED) - set(LIBOMP_INSTALL_KIND LIBRARY) + set(LIBOMP_LIBRARY_KIND SHARED) + set(LIBOMP_INSTALL_KIND LIBRARY) else() set(LIBOMP_LIBRARY_SUFFIX ${CMAKE_STATIC_LIBRARY_SUFFIX}) - set(LIBOMP_LIBRARY_KIND STATIC) - set(LIBOMP_INSTALL_KIND ARCHIVE) + set(LIBOMP_LIBRARY_KIND STATIC) + set(LIBOMP_INSTALL_KIND ARCHIVE) endif() set(LIBOMP_LIB_FILE ${LIBOMP_LIB_NAME}${LIBOMP_LIBRARY_SUFFIX}) diff --git a/openmp/runtime/cmake/config-ix.cmake b/openmp/runtime/cmake/config-ix.cmake index ef1f0a4d6c8..b1f8b6711c0 100644 --- a/openmp/runtime/cmake/config-ix.cmake +++ b/openmp/runtime/cmake/config-ix.cmake @@ -194,11 +194,11 @@ endif() if(${LIBOMP_STATS}) check_c_source_compiles( "__thread int x; - int main(int argc, char** argv) + int main(int argc, char** argv) { x = argc; return x; }" LIBOMP_HAVE___THREAD) check_c_source_compiles( - "int main(int argc, char** argv) + "int main(int argc, char** argv) { unsigned long long t = __builtin_readcyclecounter(); return 0; }" LIBOMP_HAVE___BUILTIN_READCYCLECOUNTER) if(NOT LIBOMP_HAVE___BUILTIN_READCYCLECOUNTER) @@ -253,7 +253,7 @@ if(${LIBOMP_USE_HWLOC}) set(CMAKE_REQUIRED_INCLUDES ${LIBOMP_HWLOC_INSTALL_DIR}/include) check_include_file(hwloc.h LIBOMP_HAVE_HWLOC_H) set(CMAKE_REQUIRED_INCLUDES) - check_library_exists(hwloc hwloc_topology_init + check_library_exists(hwloc hwloc_topology_init ${LIBOMP_HWLOC_INSTALL_DIR}/lib LIBOMP_HAVE_LIBHWLOC) find_library(LIBOMP_HWLOC_LIBRARY hwloc ${LIBOMP_HWLOC_INSTALL_DIR}/lib) get_filename_component(LIBOMP_HWLOC_LIBRARY_DIR ${LIBOMP_HWLOC_LIBRARY} PATH) |
