Merge pull request #6 from Intermodalics/fix/install_cmake_files

Fix installation of new cmake files
Intermodalics · Sep 24, 2020 · f82f367 · f82f367
2 parents 35ccb2c + 0715dca
commit f82f367
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -28,7 +28,7 @@ before_install:
   - pip install setuptools argparse catkin-pkg PyYAML psutil osrf_pycommon pyenchant sphinxcontrib-spelling
 install:
   # Install catkin_tools
-  - python setup.py develop
+  - python setup.py install
 before_script:
   # Install catkin_tools test harness dependencies
   - ./.travis.before_script.bash

diff --git a/catkin_tools/common.py b/catkin_tools/common.py
@@ -28,7 +28,10 @@
     _cmd_split(u'\u00E9')
 
     def cmd_split(s):
-        return _cmd_split(s.decode('utf-8'))
+        if sys.version_info.major == 3:
+            return _cmd_split(str(s, 'utf-8'))
+        else:
+            return _cmd_split(s.decode('utf-8'))
 except UnicodeEncodeError:
     cmd_split = _cmd_split
 

diff --git a/setup.py b/setup.py
@@ -109,6 +109,8 @@ def run(self):
     packages=find_packages(exclude=['tests*', 'docs']),
     package_data={
         'catkin_tools': [
+            'jobs/cmake/python.cmake',
+            'jobs/cmake/python_install_dir.cmake',
             'notifications/resources/linux/catkin_icon.png',
             'notifications/resources/linux/catkin_icon_red.png',
             'verbs/catkin_shell_verbs.bash',