Refactored CMake-code.

ufz · May 28, 2019 · 9f71cae · 9f71cae
1 parent 00ad8f2
commit 9f71cae
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 63 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,10 +3,10 @@
 ###################
 
 cmake_minimum_required(VERSION 3.10)
-
-set(PDAF_FLAGS "-fPIC")
 project(OGS-PDAF Fortran)
 
-add_definitions(${PDAF_FLAGS})
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+set(BUILD_SHARED_LIBS ON)
 
+add_subdirectory(pdaf_base/src)
 add_subdirectory(pdaf_user)
diff --git a/README.md b/README.md
@@ -0,0 +1,11 @@
+# PDAF-OGS module
+
+## Build
+
+```bash
+mkdir build; cd build
+FC=mpif90 cmake ../[path-to-sources]
+make
+```
+
+Find the shared library `pdaf` in `build/pdaf_user/`.
diff --git a/pdaf_base/CMakeLists.txt b/pdaf_base/CMakeLists.txt
diff --git a/pdaf_base/src/CMakeLists.txt b/pdaf_base/src/CMakeLists.txt
@@ -1,5 +1,5 @@
 file(GLOB PDAF_BASE_SOURCES *.F90)
 
-include_directories(dummympi)
-
-add_library(PDAF_base ${PDAF_BASE_SOURCES})
+add_library(PDAF_base STATIC ${PDAF_BASE_SOURCES})
+target_include_directories(PDAF_base PRIVATE dummympi)
+target_compile_options(PDAF_base PRIVATE "-fdefault-real-8")
diff --git a/pdaf_user/CMakeLists.txt b/pdaf_user/CMakeLists.txt
@@ -1,9 +1,9 @@
-cmake_minimum_required(VERSION 3.10)
-
 file(GLOB PDAF_USER_SOURCES *.F90)
 
-include_directories(dummympi)
+add_library(pdaf ${PDAF_USER_SOURCES})
+target_include_directories(pdaf PRIVATE dummympi)
+target_link_libraries(pdaf PRIVATE PDAF_base)
 
-add_library(PDAF_user SHARED ${PDAF_USER_SOURCES})
-set_target_properties(PDAF_user PROPERTIES PREFIX "")
-set_target_properties(PDAF_user PROPERTIES OUTPUT_NAME "pdaf")
+if(APPLE AND BUILD_SHARED_LIBS)
+    target_link_libraries(pdaf PUBLIC "-framework Accelerate")
+endif()
diff --git a/pdaf_user/cmake_install.cmake b/pdaf_user/cmake_install.cmake