Remove compiler macros defined via compiler flags

Use <shogun/lib/config.h> and swig_config.h for configure paramters
shogun-toolbox · May 3, 2015 · 91f9825 · 91f9825
1 parent 7f15f5e
commit 91f9825
Show file tree

Hide file tree

Showing 29 changed files with 370 additions and 461 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/cmake/CommonModularInterface.cmake b/cmake/CommonModularInterface.cmake
@@ -5,9 +5,6 @@ endif()
 INCLUDE_DIRECTORIES(${INCLUDES})
 
 # transform defines to -D<definition> string
-foreach(D IN LISTS DEFINES)
-	SET(CMAKE_SWIG_FLAGS "${CMAKE_SWIG_FLAGS};-D${D}")
-endforeach()
 
 # set compiler SWIG generated cxx compiler flags
 SET(CMAKE_CXX_FLAGS ${SWIG_CXX_COMPILER_FLAGS})
@@ -46,8 +43,6 @@ IF(DEFINED TARGET_SWIGFLAGS)
 ENDIF()
 SET(SWIG_MODULE_${MODULAR_NAME}_modular_EXTRA_DEPS ${modular_files})
 SWIG_ADD_MODULE(${MODULAR_NAME}_modular ${MODULAR_NAME} modshogun.i sg_print_functions.cpp)
-set_target_properties(${SWIG_MODULE_${MODULAR_NAME}_modular_REAL_NAME} PROPERTIES
-						COMPILE_DEFINITIONS "${DEFINES}")
 SWIG_LINK_LIBRARIES(${MODULAR_NAME}_modular shogun ${MODULAR_LIBARIES})
 SET_TARGET_PROPERTIES(${SWIG_MODULE_${MODULAR_NAME}_modular_REAL_NAME} PROPERTIES OUTPUT_NAME ${PREPEND_TARGET}modshogun)
 ADD_DEPENDENCIES(${SWIG_MODULE_${MODULAR_NAME}_modular_REAL_NAME} ${MODULAR_NAME}_modular_src)
@@ -92,4 +87,6 @@ IF(SWIG_SINGLE_THREADED)
 		CACHE STRING "List of modular-interfaces beeing build." FORCE)
 ENDIF(SWIG_SINGLE_THREADED)
 
+CONFIGURE_FILE(${COMMON_MODULAR_SRC_DIR}/swig_config.h.in swig_config.h)
+
 ENDMACRO()
diff --git a/cmake/ShogunUtils.cmake b/cmake/ShogunUtils.cmake
@@ -37,12 +37,6 @@ MACRO(PrintInterfaceStatus INTERFACE_NAME INTERFACE_FLAG)
 	ENDIF()
 ENDMACRO()
 
-MACRO(AppendToDefines MACRO)
-	IF (${MACRO})
-		LIST(APPEND DEFINES ${MACRO})
-	ENDIF()
-ENDMACRO()
-
 # based on compiz_discover_tests
 function (shogun_discover_tests EXECUTABLE)
 

diff --git a/src/interfaces/modular/modshogun.i b/src/interfaces/modular/modshogun.i
@@ -17,6 +17,8 @@
 #endif // defined(__APPLE__)
 %}
 
+%include "swig_config.h"
+
 %define DOCSTR
 "The `modshogun` module gathers all modules available in the SHOGUN toolkit."
 %enddef

diff --git a/src/interfaces/modular/swig_config.h.in b/src/interfaces/modular/swig_config.h.in
@@ -0,0 +1,27 @@
+#ifndef __SHOGUN_SWIG_CONFIG_H__
+#define __SHOGUN_SWIG_CONFIG_H__
+
+#include <shogun/lib/config.h>
+
+#cmakedefine PYTHON3 1
+#cmakedefine HAVE_PYTHON 1
+#cmakedefine HAVE_OCTAVE 1
+
+#cmakedefine HAVE_JBLAS 1
+
+#cmakedefine USE_CHAR 1
+#cmakedefine USE_BOOL 1
+#cmakedefine USE_UINT8 1
+#cmakedefine USE_UINT16 1
+#cmakedefine USE_UINT32 1
+#cmakedefine USE_UINT64 1
+#cmakedefine USE_INT8 1
+#cmakedefine USE_INT16 1
+#cmakedefine USE_INT32 1
+#cmakedefine USE_INT64 1
+#cmakedefine USE_FLOAT32 1
+#cmakedefine USE_FLOAT64 1
+#cmakedefine USE_COMPLEX128 1
+#cmakedefine USE_FLOATMAX 1
+
+#endif /* __SHOGUN_SWIG_CONFIG_H__ */
diff --git a/src/shogun/CMakeLists.txt b/src/shogun/CMakeLists.txt
@@ -29,7 +29,6 @@ ENDIF()
 # add target to compile the libshogun sources
 add_library(libshogun OBJECT ${LIBSHOGUN_SRC} base/class_list.cpp)
 set_target_properties(libshogun PROPERTIES
-    COMPILE_DEFINITIONS "${DEFINES}"
     POSITION_INDEPENDENT_CODE TRUE)
 IF (SANITIZER_FLAGS)
   set_target_properties(libshogun PROPERTIES COMPILE_FLAGS ${SANITIZER_FLAGS})