- picking up dependencies directly from dependency dir

Author: fbergmann

setup.py

@@ -270,19 +270,13 @@ def build_cmake(self, extension):
           if not zlib: 
             zlib = get_lib_full_path(os.path.join(DEP_DIR, 'lib'), 'zdll')
           cmake_args.append('-DLIBSBML_DEPENDENCY_DIR=' + DEP_DIR)
-          cmake_args.append('-DLIBEXPAT_INCLUDE_DIR=' + join(DEP_DIR, 'include'))
-          cmake_args.append('-DLIBEXPAT_LIBRARY=' + get_lib_full_path(os.path.join(DEP_DIR, 'lib'), 'expat'))
-          cmake_args.append('-DLIBZ_LIBRARY=' + zlib)
-          cmake_args.append('-DLIBBZ_LIBRARY=' + get_lib_full_path(os.path.join(DEP_DIR, 'lib'), 'bz2'))
 
         if is_win_32:
           if DEP_DIR32:
             cmake_args.append('-DLIBSBML_DEPENDENCY_DIR=' + DEP_DIR32)
-            cmake_args.append('-DLIBEXPAT_INCLUDE_DIR=' + join(DEP_DIR32, 'include'))
         elif is_win:
           if DEP_DIR64:
             cmake_args.append('-DLIBSBML_DEPENDENCY_DIR=' + DEP_DIR64)
-            cmake_args.append('-DLIBEXPAT_INCLUDE_DIR=' + join(DEP_DIR64, 'include'))
 
         os.chdir(build_temp)
         self.spawn(['cmake', SRC_DIR] + cmake_args)