Browse Source

Merge branch 'master' of https://lemma.codes/Lemma

iss7
Trevor Irons 5 years ago
parent
commit
74ca15e27c
2 changed files with 8 additions and 1 deletions
  1. 4
    0
      CMakeLists.txt
  2. 4
    1
      Modules/LemmaCore/CMakeLists.txt

+ 4
- 0
CMakeLists.txt View File

265
 option( MSVC_EXTENDED_ALIGNMENT "Turn on MSVC compiler definition _ENABLE_EXTENDED_ALIGNED_STORAGE " OFF  )
265
 option( MSVC_EXTENDED_ALIGNMENT "Turn on MSVC compiler definition _ENABLE_EXTENDED_ALIGNED_STORAGE " OFF  )
266
 if (MSVC_EXTENDED_ALIGNMENT)
266
 if (MSVC_EXTENDED_ALIGNMENT)
267
     add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE)
267
     add_definitions(-D_ENABLE_EXTENDED_ALIGNED_STORAGE)
268
+    SET(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} /LTCG")
269
+    #add_definitions(-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE)
270
+    #set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS TRUE)
271
+    #include(GenerateExportHeader)
268
 endif()
272
 endif()
269
 
273
 
270
 ####################
274
 ####################

+ 4
- 1
Modules/LemmaCore/CMakeLists.txt View File

1
 add_subdirectory("src")
1
 add_subdirectory("src")
2
-add_library( lemmacore ${SOURCE} )  
2
+add_library( lemmacore ${SOURCE} ) 
3
 target_include_directories( lemmacore PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
3
 target_include_directories( lemmacore PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include" )
4
 
4
 
5
 set_target_properties(lemmacore PROPERTIES 
5
 set_target_properties(lemmacore PROPERTIES 
9
     CXX_STANDARD 14
9
     CXX_STANDARD 14
10
     CXX_STANDARD_REQUIRED ON
10
     CXX_STANDARD_REQUIRED ON
11
 )
11
 )
12
+
13
+#generate_export_header(lemmacore)
14
+
12
 #add_dependencies(lemmacore YAML_CPP)
15
 #add_dependencies(lemmacore YAML_CPP)
13
 
16
 
14
 #if (LEMMA_TINYXML_SUPPORT)
17
 #if (LEMMA_TINYXML_SUPPORT)

Loading…
Cancel
Save