Sfoglia il codice sorgente

build script clean up

Roberto Parolin 6 anni fa
parent
commit
4664f43e03
2 ha cambiato i file con 7 aggiunte e 15 eliminazioni
  1. 7 10
      CMakeLists.txt
  2. 0 5
      test/CMakeLists.txt

+ 7 - 10
CMakeLists.txt

@@ -10,21 +10,18 @@ project(EABase CXX)
 option(EABASE_BUILD_TESTS "Enable generation of build files for tests" OFF)
 
 #-------------------------------------------------------------------------------------------
-# Defines 
-#-------------------------------------------------------------------------------------------
-add_definitions(-D_CHAR16T)
-
-#-------------------------------------------------------------------------------------------
-# Source files
+# Package Tests 
 #-------------------------------------------------------------------------------------------
-file(GLOB EABASE_SOURCES "include/Common/EABase/*.h" "include/Common/EABase/config/*.h")
-
 if(EABASE_BUILD_TESTS)
     add_subdirectory(test)
 endif()
 
 #-------------------------------------------------------------------------------------------
-# exported include directories 
+# Defines 
 #-------------------------------------------------------------------------------------------
-# target_include_directories(EABase INTERFACE include/Common)
+add_definitions(-D_CHAR16T)
 
+#-------------------------------------------------------------------------------------------
+# Export Include Directories
+#-------------------------------------------------------------------------------------------
+target_include_directories(EABase INTERFACE include/Common)

+ 0 - 5
test/CMakeLists.txt

@@ -22,11 +22,6 @@ add_definitions(-D_CHAR16T)
 set (CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};${CMAKE_CURRENT_SOURCE_DIR}/../../EASTL/scripts/CMake")
 include(CommonCppFlags)
 
-#-------------------------------------------------------------------------------------------
-# Include directories
-#-------------------------------------------------------------------------------------------
-include_directories(source "../include/Common")
-
 #-------------------------------------------------------------------------------------------
 # Source files
 #-------------------------------------------------------------------------------------------