From 9f200d1e73a1d2e88fd04a15c57480fdcd94aa7e Mon Sep 17 00:00:00 2001
From: bienchen <stefanbienert@me.com>
Date: Thu, 10 Oct 2013 21:07:57 +0200
Subject: [PATCH] Added __init__ for promod3
---
CMakeLists.txt | 1 +
cmake_support/PROMOD3.cmake | 9 +++++----
core/CMakeLists.txt | 1 +
core/pymod/CMakeLists.txt | 3 +++
core/pymod/__init__.py | 0
5 files changed, 10 insertions(+), 4 deletions(-)
create mode 100644 core/CMakeLists.txt
create mode 100644 core/pymod/CMakeLists.txt
create mode 100644 core/pymod/__init__.py
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ac0bb336..1c00e1fb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,6 +64,7 @@ set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
## sub dirs to be recognised by CMake
## e.g. add_subdirectory(src), subdirs have thier own CMakeLists.txt
add_subdirectory(config)
+add_subdirectory(core)
add_subdirectory(meld)
add_subdirectory(scripts)
diff --git a/cmake_support/PROMOD3.cmake b/cmake_support/PROMOD3.cmake
index ce126bba..23722e1b 100644
--- a/cmake_support/PROMOD3.cmake
+++ b/cmake_support/PROMOD3.cmake
@@ -492,12 +492,13 @@ endmacro()
#-------------------------------------------------------------------------------
# Synopsis:
# pymod(NAME name CPP source1 source2 PY source source2 [IN_DIR dir]
-# source3 source4 [IN_DIR dir] [LINK link] [OUTPUT_DIR dir] [UI user_interface_files])
+# source3 source4 [IN_DIR dir] [LINK link] [OUTPUT_DIR dir]
+# [UI user_interface_files])
#
# Description:
-# Define a python module consisting of C++ type wrappers and/or code written in
-# Python.
-# NAME is the name of
+# Define a python module consisting of C++ type wrappers and/or code written
+# in Python.
+# OUTPUT_DIR defines, where in the 'promod3' tree the files will be placed
#-------------------------------------------------------------------------------
macro(pymod)
#-----------------------------------------------------------------------------
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
new file mode 100644
index 00000000..08f4c892
--- /dev/null
+++ b/core/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(pymod)
diff --git a/core/pymod/CMakeLists.txt b/core/pymod/CMakeLists.txt
new file mode 100644
index 00000000..c91fd370
--- /dev/null
+++ b/core/pymod/CMakeLists.txt
@@ -0,0 +1,3 @@
+set(PROMOD3_CORE_FILES __init__.py)
+
+pymod(NAME core PY ${PROMOD3_CORE_FILES} __init__.py OUTPUT_DIR "promod3")
diff --git a/core/pymod/__init__.py b/core/pymod/__init__.py
new file mode 100644
index 00000000..e69de29b
--
GitLab