diff --git a/cmake/GtsamPythonWrap.cmake b/cmake/GtsamPythonWrap.cmake
index d065a7828..fbad77a82 100644
--- a/cmake/GtsamPythonWrap.cmake
+++ b/cmake/GtsamPythonWrap.cmake
@@ -50,7 +50,8 @@ function(wrap_python TARGET_NAME PYTHON_MODULE_DIRECTORY)
 
   # On OSX and Linux, the python library must end in the extension .so. Build this
   # filename here.
-  get_property(PYLIB_OUTPUT_FILE TARGET ${TARGET_NAME} PROPERTY LOCATION)
+  #get_property(PYLIB_OUTPUT_FILE TARGET ${TARGET_NAME} PROPERTY LOCATION)
+  set(PYLIB_OUTPUT_FILE $<TARGET_FILE:${TARGET_NAME}>)
   get_filename_component(PYLIB_OUTPUT_NAME ${PYLIB_OUTPUT_FILE} NAME_WE)
   set(PYLIB_SO_NAME ${PYLIB_OUTPUT_NAME}.so)
 
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index cd9861dc0..6693beba5 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -18,7 +18,7 @@ file(GLOB slam_src "slam/*.cpp")
 file(GLOB symbolic_src "symbolic/*.cpp")
 
 #wrap_python("base" ${PROJECT_SOURCE_DIR}/python/${PROJECT_NAME} ${base_src})
-wrap_python("gtsam" ${PROJECT_SOURCE_DIR}/python/gtsam exportgtsam.cpp 
+wrap_python("pygtsam" ${PROJECT_SOURCE_DIR}/python/gtsam exportgtsam.cpp 
   ${geometry_src} ${linear_src} ${nonlinear_src} ${slam_src})
 #wrap_python("nonlinear" ${PROJECT_SOURCE_DIR}/python/gtsam ${nonlinear_src})
 #wrap_python("slam" ${PROJECT_SOURCE_DIR}/python/gtsam ${slam_src})