FIxing appveyor/travis

sci-visus · Oct 3, 2018 · ef651bc · ef651bc
1 parent fb934ea
commit ef651bc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/CMake/OpenVisus.py b/CMake/OpenVisus.py
@@ -1,9 +1,13 @@
-
 import os,sys
 
-__this_dir__=os.path.dirname(os.path.abspath(__file__))
+__this_dir__=os.path.abspath(os.path.dirname(os.path.abspath(__file__)))
 if not __this_dir__ in sys.path:
   sys.path.append(__this_dir__)
+
+__bin_dir__=os.path.abspath(__this_dir__+ "/bin")
+if not __bin_dir__ in sys.path:
+  sys.path.append(__bin_dir__)
+
 
 # /////////////////////////////////////////////////////////
 def check():

diff --git a/CMake/setup.py b/CMake/setup.py
@@ -3,7 +3,7 @@
 import platform
 
 #increase this number for PIP
-VERSION="1.2.42"
+VERSION="1.2.43"
 
 WIN32=platform.system()=="Windows" or platform.system()=="win32"
 APPLE=platform.system()=="Darwin"
@@ -47,12 +47,6 @@ def findFilesInCurrentDirectory():
 					if filename.endswith(".pdb"): 
 						continue
 
-					if filename.startswith(os.path.abspath('./bin')) and os.path.basename(filename).startswith("Qt5") and os.path.basename(filename).endswith(".dll"): 
-						continue
-
-					if filename.startswith(os.path.abspath('./bin/plugins')): 
-						continue		    	
-
 			ret.append(filename)
 
 	return ret