diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index bf04336..a87b3aa 100644
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -69,11 +69,11 @@ ENDIF ()
 swig_link_libraries(javamcsapi mcsapi)
 
 ADD_CUSTOM_COMMAND(TARGET javamcsapi POST_BUILD
-    COMMAND "${CMAKE_CURRENT_BINARY_DIR}/gradlew" jar
+    COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/gradlew" jar
 )
 INSTALL(TARGETS javamcsapi DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT libs)
 IF(TEST_RUNNER)
-  add_test(NAME Java_BasicTest COMMAND "${CMAKE_CURRENT_BINARY_DIR}/gradlew" test)
+    add_test(NAME Java_BasicTest COMMAND "${CMAKE_CURRENT_SOURCE_DIR}/gradlew" test)
 ENDIF(TEST_RUNNER)
 
 INSTALL(FILES build/libs/javamcsapi.jar DESTINATION  ${CMAKE_INSTALL_LIBDIR})
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 3d82236..4087e21 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -73,17 +73,17 @@ IF(PYTHON2_AVAILABLE OR PYTHON3_AVAILABLE)
       "pymcsapi.py"
       "pymcsapi_wrap.cxx")
   add_custom_command(OUTPUT ${SWIG_PYTHON_WRAPPER_SOURCE}
-                     COMMAND ${SWIG_EXECUTABLE} -c++ -python -I.. pymcsapi.i
-                     COMMENT "Generating the Python wrapper source code")
-					 
+      COMMAND ${SWIG_EXECUTABLE} -c++ -python -I${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/pymcsapi.i
+      COMMENT "Generating the Python wrapper source code")
+
   IF(PYTHON2_AVAILABLE)
-    add_library(_pymcsapi SHARED pymcsapi_wrap.cxx)
+    add_library(_pymcsapi SHARED "${CMAKE_CURRENT_SOURCE_DIR}/pymcsapi_wrap.cxx")
     set_target_properties(_pymcsapi PROPERTIES OUTPUT_NAME "_pymcsapi")
     set_target_properties(_pymcsapi PROPERTIES PREFIX "")
     set_target_properties(_pymcsapi PROPERTIES LIBRARY_OUTPUT_DIRECTORY "python_build")
     target_include_directories(_pymcsapi PRIVATE ${PYTHON2_INCLUDE_DIR})
     target_link_libraries(_pymcsapi mcsapi)
-    
+
     #Tests
     IF(TEST_RUNNER)
       add_test(NAME test_basic COMMAND ${PYTHON2_EXECUTABLE} -m pytest test/test_basic.py)
@@ -97,7 +97,7 @@ IF(PYTHON2_AVAILABLE OR PYTHON3_AVAILABLE)
     install(FILES pymcsapi.py DESTINATION ${PYTHON2_SITE_PACKAGES})
   ENDIF(PYTHON2_AVAILABLE)
   IF(PYTHON3_AVAILABLE)
-    add_library(_pymcsapi3 SHARED pymcsapi_wrap.cxx)
+    add_library(_pymcsapi3 SHARED "${CMAKE_CURRENT_SOURCE_DIR}/pymcsapi_wrap.cxx")
     set_target_properties(_pymcsapi3 PROPERTIES OUTPUT_NAME "_pymcsapi")
     set_target_properties(_pymcsapi3 PROPERTIES PREFIX "")
     set_target_properties(_pymcsapi3 PROPERTIES LIBRARY_OUTPUT_DIRECTORY "python3_build")