rollback output lib wrapper

Author: Sam Hatchett

owa-epanet/CMakeLists.txt

@@ -20,20 +20,29 @@ INCLUDE_DIRECTORIES(EPANET/src/outfile/include)
 
 SET(CMAKE_SWIG_FLAGS "")
 
-SET_SOURCE_FILES_PROPERTIES(epanet.i PROPERTIES CPLUSPLUS ON)
-SET_SOURCE_FILES_PROPERTIES(epanet.i PROPERTIES SWIG_FLAGS "-includeall")
+SET_SOURCE_FILES_PROPERTIES(toolkit.i PROPERTIES CPLUSPLUS ON)
+SET_SOURCE_FILES_PROPERTIES(toolkit.i PROPERTIES SWIG_FLAGS "-includeall")
+
 
 # build the EPANET library
 ADD_SUBDIRECTORY(EPANET)
 
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-SWIG_ADD_LIBRARY( toolkit LANGUAGE python SOURCES wrapper/toolkit.i)
+
+SWIG_ADD_LIBRARY( toolkit LANGUAGE python SOURCES wrapper/toolkit.i )
 set_property(SOURCE toolkit.i PROPERTY USE_LIBRARY_INCLUDE_DIRECTORIES TRUE)
 set_property(TARGET epanet2 PROPERTY SWIG_USE_TARGET_INCLUDE_DIRECTORIES TRUE)
 SWIG_LINK_LIBRARIES(toolkit epanet2)
 SWIG_LINK_LIBRARIES(toolkit ${PYTHON_LIBRARIES})
 set_property(TARGET _toolkit PROPERTY INSTALL_RPATH "$ORIGIN")
 
+#SWIG_ADD_LIBRARY( output LANGUAGE python SOURCES wrapper/output.i )
+#SET_PROPERTY( SOURCE output.i PROPERTY USE_LIBRARY_INCLUDE_DIRECTORIES TRUE )
+#SET_PROPERTY( TARGET epanet-output PROPERTY SWIG_USE_TARGET_INCLUDE_DIRECTORIES TRUE )
+#SWIG_LINK_LIBRARIES( output epanet-output)
+#SWIG_LINK_LIBRARIES( output ${PYTHON_LIBRARIES} )
+#SET_PROPERTY( TARGET _output PROPERTY INSTALL_RPATH "$ORIGIN" )
+
 IF (APPLE)
   set_target_properties(_toolkit PROPERTIES INSTALL_RPATH "@loader_path")
 ENDIF (APPLE)
@@ -51,3 +60,16 @@ add_custom_command(
         COMMAND ${CMAKE_COMMAND} -E copy
                 ${CMAKE_CURRENT_BINARY_DIR}/lib/libepanet2.*
                 ${CMAKE_CURRENT_BINARY_DIR}/../../../packages/epanet/)
+
+
+#add_custom_command(
+#        TARGET _toolkit POST_BUILD
+#        COMMAND ${CMAKE_COMMAND} -E copy
+#                ${CMAKE_CURRENT_BINARY_DIR}/output.py
+#                ${CMAKE_CURRENT_BINARY_DIR}/../../../packages/epanet/output.py)
+
+#add_custom_command(
+#        TARGET _toolkit POST_BUILD
+#        COMMAND ${CMAKE_COMMAND} -E copy
+#                ${CMAKE_CURRENT_BINARY_DIR}/lib/libepanet-output.*
+#                ${CMAKE_CURRENT_BINARY_DIR}/../../../packages/epanet/)