Changeset: 942a68bd6263 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=942a68bd6263
Added Files:
misc/CMakeLists.txt
misc/python/CMakeLists.txt
misc/python/create_include_object.py.in
misc/python/fixlicense.py
Removed Files:
buildtools/conf/fixlicense.py
create_include_object.py.in
Modified Files:
CMakeLists.txt
cmake/monetdb-functions.cmake
Branch: default
Log Message:
move python script
diffs (72 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,11 +140,6 @@ install(FILES
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/monetdb
COMPONENT monetdbdev)
-# [TODO]: install created python file
-configure_file(create_include_object.py.in
- ${CMAKE_CURRENT_BINARY_DIR}/create_include_object.py
- @ONLY)
-
if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
set(CMAKE_MODULE_LINKER_FLAGS "-Wl,-undefined,dynamic_lookup
-Wl,-undefined,dynamic_lookup")
endif()
@@ -152,6 +147,7 @@ endif()
add_subdirectory(common)
add_subdirectory(clients)
add_subdirectory(gdk)
+add_subdirectory(misc)
add_subdirectory(monetdb5)
add_subdirectory(sql)
add_subdirectory(geom)
diff --git a/cmake/monetdb-functions.cmake b/cmake/monetdb-functions.cmake
--- a/cmake/monetdb-functions.cmake
+++ b/cmake/monetdb-functions.cmake
@@ -83,7 +83,7 @@ function(create_include_object)
foreach(mod_name IN LISTS create_prefix_modules_list)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${mod_name}.${lang_ext}.c
- COMMAND ${Python3_EXECUTABLE}
${PROJECT_BINARY_DIR}/create_include_object.py ${mod_name} ${lang_ext}
${file_path}/${mod_name}.${lang_ext}
${CMAKE_CURRENT_BINARY_DIR}/${mod_name}.${lang_ext}.c
+ COMMAND ${Python3_EXECUTABLE}
${PROJECT_BINARY_DIR}/misc/python/create_include_object.py ${mod_name}
${lang_ext} ${file_path}/${mod_name}.${lang_ext}
${CMAKE_CURRENT_BINARY_DIR}/${mod_name}.${lang_ext}.c
DEPENDS ${file_path}/${mod_name}.${lang_ext}
)
list(APPEND include_sources
diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/misc/CMakeLists.txt
@@ -0,0 +1,9 @@
+#[[
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
+#]]
+
+add_subdirectory(python)
diff --git a/misc/python/CMakeLists.txt b/misc/python/CMakeLists.txt
new file mode 100644
--- /dev/null
+++ b/misc/python/CMakeLists.txt
@@ -0,0 +1,12 @@
+#[[
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+# Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V.
+#]]
+
+# [TODO]: install created python file
+configure_file(create_include_object.py.in
+ ${CMAKE_CURRENT_BINARY_DIR}/create_include_object.py
+ @ONLY)
diff --git a/create_include_object.py.in
b/misc/python/create_include_object.py.in
rename from create_include_object.py.in
rename to misc/python/create_include_object.py.in
diff --git a/buildtools/conf/fixlicense.py b/misc/python/fixlicense.py
rename from buildtools/conf/fixlicense.py
rename to misc/python/fixlicense.py
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
