diff --git a/CMakeLists.txt b/CMakeLists.txt
index 30a6bd57..897d9ef2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,9 +9,9 @@ endif()
 project (sz)
 enable_testing()
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -std=c99 -fopenmp")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -std=c++11 -fopenmp")
+find_package (OpenMP REQUIRED)
 
+set(CMAKE_C_STANDARD 99)
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_EXTENSIONS OFF)
 
diff --git a/sz/CMakeLists.txt b/sz/CMakeLists.txt
index d8b8a4b6..6f5bf0af 100644
--- a/sz/CMakeLists.txt
+++ b/sz/CMakeLists.txt
@@ -1,14 +1,15 @@
 aux_source_directory(src sz_sources)
 
 add_library (SZ SHARED ${sz_sources})
-target_link_libraries (SZ ${ZLIB_LIBRARIES} ${ZSTD_LIBRARIES})
+target_link_libraries (SZ PRIVATE ${ZLIB_LIBRARIES} ${ZSTD_LIBRARIES})
 if (UNIX)
-  target_link_libraries (SZ m)
+  target_link_libraries (SZ PUBLIC m)
 endif ()
 
-target_compile_options(SZ
-	PRIVATE $<$<CONFIG:Debug>:-O3 -Wall -Wextra -Wpedantic -Wno-unused-parameter>
-	)
+if (OPENMP_FOUND)
+  target_compile_options (SZ PRIVATE ${OpenMP_C_FLAGS})
+  target_link_libraries (SZ PRIVATE ${OpenMP_C_LIBRARIES})
+endif ()
 
 install (TARGETS SZ LIBRARY DESTINATION lib ARCHIVE DESTINATION lib RUNTIME DESTINATION bin)