Merge remote-tracking branch 'origin/master'

Aquaveo · Jun 8, 2018 · abe9213 · abe9213
2 parents effd216 + 7121f70
commit abe9213
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -99,7 +99,6 @@ if(BUILD_TESTING)
         xmscore/testing/TestTools.h
     )
 
-
     list(APPEND xmscore_sources
         xmscore/testing/TestTools.cpp
     )
@@ -144,8 +143,8 @@ if(IS_PYTHON_BUILD)
 
   # Pybind11 sources
   set(xmscore_py
-    xmscore/python/cxxtest.cpp
     xmscore/python/xmscore_py.cpp
+    xmscore/python/cxxtest.cpp
     # Misc
     xmscore/python/misc/misc_py.cpp
     xmscore/python/misc/observer_py.cpp
@@ -178,6 +177,7 @@ if(IS_PYTHON_BUILD)
     )
     target_include_directories(xmscore_py
         PRIVATE
+          ${EXT_LIBS}
           PYTHON_INCLUDE_DIRS
     )
     target_link_libraries(xmscore_py