Move required link libraries definition to ./wrappers/CMakeLists.txt …

…- OTX_LINK_LIBS for further automation. Each wrapper's individual CMakeLists.txt file now uses to get link requirements.
Open-Transactions · Sep 2, 2014 · ce0aede · ce0aede
1 parent 13fae2a
commit ce0aede
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/wrappers/CMakeLists.txt b/wrappers/CMakeLists.txt
@@ -1,4 +1,10 @@
+#
+# Define everything here that all wrappers will use,
+# then process each language in its own subdirectory
+#
 
+
+# Locate include files for our wrappers
 set(SWIG_INCLUDE_DIRS 
   SYSTEM
   ${CMAKE_CURRENT_SOURCE_DIR}/../deps/
@@ -10,6 +16,12 @@ set(SWIG_INCLUDE_DIRS
   ${CMAKE_CURRENT_SOURCE_DIR}/../include/opentxs/client
 )
 
+
+# The opentxs libraries will we link to
+set(OTX_LINK_LIBS opentxs-client)
+
+
+# Build wrappers for each lang enabled
 if(PYTHON)
   subdirs(python)
 endif(PYTHON)

diff --git a/wrappers/csharp/CMakeLists.txt b/wrappers/csharp/CMakeLists.txt
@@ -25,7 +25,7 @@ set(CMAKE_SWIG_OUTDIR ${CSHARP_BINARY_DIRECTORY})
 
 
 # -dllimport = native/glue lib
-set(CMAKE_SWIG_FLAGS "-namespace Opentxs -dllimport opentxs-client -outdir ${CMAKE_SWIG_OUTDIR}" )
+set(CMAKE_SWIG_FLAGS "-namespace Opentxs -dllimport ${OTX_LINK_LIBS} -outdir ${CMAKE_SWIG_OUTDIR}" )
 separate_arguments(CMAKE_SWIG_FLAGS)
 
 # so file
@@ -34,12 +34,12 @@ set_source_files_properties(OTX_.i PROPERTIES CPLUSPLUS on)
 
 
 swig_add_module(${OTX_WRAPPER_NAME} csharp OTX_.i)
-swig_link_libraries(${OTX_WRAPPER_NAME} opentxs-client)
+swig_link_libraries(${OTX_WRAPPER_NAME} ${OTX_LINK_LIBS})
 
 set(MOD_NAME ${SWIG_MODULE_${OTX_WRAPPER_NAME}_REAL_NAME})
 
 # add_library(Opentxs-sharp opentxs-client)
-target_link_libraries(${MOD_NAME} opentxs-client)
+target_link_libraries(${MOD_NAME} ${OTX_LINK_LIBS})
 set_target_properties(${MOD_NAME}
                       PROPERTIES OUTPUT_NAME ${OTX_WRAPPER_NAME})
 

diff --git a/wrappers/java/CMakeLists.txt b/wrappers/java/CMakeLists.txt
@@ -31,7 +31,7 @@ swig_link_libraries(${OTX_WRAPPER_NAME} ${JAVA_LIBRARIES})
 
 set(MOD_NAME ${SWIG_MODULE_${OTX_WRAPPER_NAME}_REAL_NAME})
 
-target_link_libraries(${MOD_NAME} opentxs-client)
+target_link_libraries(${MOD_NAME} ${OTX_LINK_LIBS})
 set_target_properties(${MOD_NAME}
                       PROPERTIES OUTPUT_NAME ${OTX_WRAPPER_NAME})
 install(TARGETS ${MOD_NAME}

diff --git a/wrappers/perl/CMakeLists.txt b/wrappers/perl/CMakeLists.txt
@@ -24,7 +24,7 @@ swig_link_libraries(${OTX_WRAPPER_NAME} ${PERL_LIBRARIES})
 
 set(MOD_NAME ${SWIG_MODULE_${OTX_WRAPPER_NAME}_REAL_NAME})
 
-target_link_libraries(${MOD_NAME} opentxs-client)
+target_link_libraries(${MOD_NAME} ${OTX_LINK_LIBS})
 set_target_properties(${MOD_NAME}
   PROPERTIES OUTPUT_NAME ${OTX_WRAPPER_NAME})
 install(TARGETS ${MOD_NAME}

diff --git a/wrappers/php/CMakeLists.txt b/wrappers/php/CMakeLists.txt
@@ -27,7 +27,7 @@ swig_link_libraries(${OTX_WRAPPER_NAME} ${PHP_LIBRARIES})
 
 set(MOD_NAME ${SWIG_MODULE_${OTX_WRAPPER_NAME}_REAL_NAME})
 
-target_link_libraries(${MOD_NAME} opentxs-client)
+target_link_libraries(${MOD_NAME} ${OTX_LINK_LIBS})
 set_target_properties(${MOD_NAME}
   PROPERTIES OUTPUT_NAME ${OTX_WRAPPER_NAME})
 install(TARGETS ${MOD_NAME}

diff --git a/wrappers/python/CMakeLists.txt b/wrappers/python/CMakeLists.txt
@@ -22,7 +22,7 @@ swig_link_libraries(${OTX_WRAPPER_NAME} ${PYTHON_LIBRARIES})
 
 set(MOD_NAME ${SWIG_MODULE_${OTX_WRAPPER_NAME}_REAL_NAME})
 
-target_link_libraries(${MOD_NAME} opentxs-client)
+target_link_libraries(${MOD_NAME} ${OTX_LINK_LIBS})
 set_target_properties(${MOD_NAME}
                       PROPERTIES OUTPUT_NAME _opentxs)
 string(REGEX REPLACE "\\.[0-9]+$" "" PYTHON_VERSION "${PYTHONLIBS_VERSION_STRING}")