Fix CMake generation

Mudlet · Aug 9, 2019 · ea68876 · ea68876
1 parent a9f09ea
commit ea68876
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 55 deletions.
diff --git a/edbee-lib/CMakeLists.txt b/edbee-lib/CMakeLists.txt
@@ -7,6 +7,8 @@ ENDIF()
 
 PROJECT(edbee-lib)
 
+add_subdirectory(../vendor/qslog/ qslog)
+
 SET(SOURCES
    edbee/util/mem/debug_new.cpp
    edbee/util/mem/debug_allocs.cpp
@@ -176,7 +178,6 @@ ENDIF()
 
 set(CMAKE_AUTOMOC ON)
 
-add_subdirectory(../vendor/qslog/ qslog)
 add_subdirectory(../vendor/onig/ onig)
 
 ADD_DEFINITIONS(

diff --git a/edbee-test/CMakeLists.txt b/edbee-test/CMakeLists.txt
@@ -8,62 +8,62 @@ ENDIF()
 PROJECT(edbee-test)
 
 SET(SOURCES
-  edbee/commands/replaceselectioncommandtest.cpp 
-  edbee/models/textrangetest.cpp 
-  edbee/models/textdocumenttest.cpp 
-  edbee/models/textbuffertest.cpp 
-  edbee/models/textlinedatatest.cpp 
-  edbee/util/gapvectortest.cpp 
-  edbee/util/lineoffsetvectortest.cpp 
-  main.cpp 
-  edbee/util/lineendingtest.cpp 
-  edbee/textdocumentserializertest.cpp 
-  edbee/io/tmlanguageparsertest.cpp 
-  edbee/util/regexptest.cpp 
-  edbee/models/textdocumentscopestest.cpp 
-  edbee/models/textundostacktest.cpp 
-  edbee/util/cascadingqvariantmaptest.cpp 
-  edbee/models/textsearchertest.cpp 
-  edbee/commands/duplicatecommandtest.cpp 
-  edbee/commands/newlinecommandtest.cpp 
-  edbee/util/utiltest.cpp 
-  edbee/lexers/grammartextlexertest.cpp 
-  edbee/commands/removecommandtest.cpp 
-  edbee/models/changes/linedatalistchangetest.cpp 
-  edbee/models/changes/textchangetest.cpp 
-  edbee/models/changes/mergablechangegrouptest.cpp 
-  edbee/util/rangesetlineiteratortest.cpp 
-  edbee/models/dynamicvariablestest.cpp 
+  edbee/commands/replaceselectioncommandtest.cpp
+  edbee/models/textrangetest.cpp
+  edbee/models/textdocumenttest.cpp
+  edbee/models/textbuffertest.cpp
+  edbee/models/textlinedatatest.cpp
+  edbee/util/gapvectortest.cpp
+  edbee/util/lineoffsetvectortest.cpp
+  main.cpp
+  edbee/util/lineendingtest.cpp
+  edbee/textdocumentserializertest.cpp
+  edbee/io/tmlanguageparsertest.cpp
+  edbee/util/regexptest.cpp
+  edbee/models/textdocumentscopestest.cpp
+  edbee/models/textundostacktest.cpp
+  edbee/util/cascadingqvariantmaptest.cpp
+  edbee/models/textsearchertest.cpp
+  edbee/commands/duplicatecommandtest.cpp
+  edbee/commands/newlinecommandtest.cpp
+  edbee/util/utiltest.cpp
+  edbee/lexers/grammartextlexertest.cpp
+  edbee/commands/removecommandtest.cpp
+  edbee/models/changes/linedatalistchangetest.cpp
+  edbee/models/changes/textchangetest.cpp
+  edbee/models/changes/mergablechangegrouptest.cpp
+  edbee/util/rangesetlineiteratortest.cpp
+  edbee/models/dynamicvariablestest.cpp
   edbee/util/rangelineiteratortest.cpp
-  edbee/views/textthememanagertest.cpp    
+  edbee/views/textthememanagertest.cpp
 )
 
 SET(HEADERS
-  edbee/commands/replaceselectioncommandtest.h 
-  edbee/models/textrangetest.h 
-  edbee/models/textdocumenttest.h 
-  edbee/models/textbuffertest.h 
-  edbee/models/textlinedatatest.h 
-  edbee/util/gapvectortest.h 
-  edbee/util/lineoffsetvectortest.h 
-  edbee/util/lineendingtest.h 
-  edbee/textdocumentserializertest.h 
-  edbee/io/tmlanguageparsertest.h 
-  edbee/util/regexptest.h 
-  edbee/models/textdocumentscopestest.h 
-  edbee/models/textundostacktest.h 
-  edbee/util/cascadingqvariantmaptest.h 
-  edbee/models/textsearchertest.h 
-  edbee/commands/duplicatecommandtest.h 
-  edbee/commands/newlinecommandtest.h 
-  edbee/util/utiltest.h 
-  edbee/lexers/grammartextlexertest.h 
-  edbee/commands/removecommandtest.h 
-  edbee/models/changes/linedatalistchangetest.h 
-  edbee/models/changes/textchangetest.h 
-  edbee/models/changes/mergablechangegrouptest.h 
-  edbee/util/rangesetlineiteratortest.h 
-  edbee/models/dynamicvariablestest.h 
+  edbee/commands/replaceselectioncommandtest.h
+  edbee/models/textrangetest.h
+  edbee/models/textdocumenttest.h
+  edbee/models/textbuffertest.h
+  edbee/models/textlinedatatest.h
+  edbee/util/gapvectortest.h
+  edbee/util/lineoffsetvectortest.h
+  edbee/util/lineendingtest.h
+  edbee/textdocumentserializertest.h
+  edbee/io/tmlanguageparsertest.h
+  edbee/util/regexptest.h
+  edbee/models/textdocumentscopestest.h
+  edbee/models/textundostacktest.h
+  edbee/util/cascadingqvariantmaptest.h
+  edbee/models/textsearchertest.h
+  edbee/commands/duplicatecommandtest.h
+  edbee/commands/newlinecommandtest.h
+  edbee/util/utiltest.h
+  edbee/lexers/grammartextlexertest.h
+  edbee/commands/removecommandtest.h
+  edbee/models/changes/linedatalistchangetest.h
+  edbee/models/changes/textchangetest.h
+  edbee/models/changes/mergablechangegrouptest.h
+  edbee/util/rangesetlineiteratortest.h
+  edbee/models/dynamicvariablestest.h
   edbee/util/rangelineiteratortest.h
   edbee/views/textthememanagertest.h
 )
@@ -72,8 +72,6 @@ FIND_PACKAGE(Qt5Core REQUIRED)
 FIND_PACKAGE(Qt5UiTools REQUIRED)
 FIND_PACKAGE(Qt5Widgets REQUIRED)
 
-add_subdirectory(../vendor/qslog/ qslog)
-
 ADD_DEFINITIONS(
     ${Qt5Core_DEFINITIONS}
     ${Qt5UiTools_DEFINTIONS}