Browse Source

Changing flags to definitions for better cross compatibility

submodule
Trevor Irons 6 years ago
parent
commit
5ba069a14c
2 changed files with 7 additions and 2 deletions
  1. 5
    2
      CMakeLists.txt
  2. 2
    0
      Modules/LemmaCore/include/LemmaCore

+ 5
- 2
CMakeLists.txt View File

@@ -167,6 +167,9 @@ if ( LEMMA_VTK7_SUPPORT )
167 167
 	if (VTK_FOUND)
168 168
 		message(STATUS "VTK 7 was found! ") 
169 169
 	        include(${VTK_USE_FILE}) 
170
+		#add_compile_options(-DLEMMAUSEVTK)
171
+		#target_compile_definitions( lemmacore PRIVATE LEMMAUSEVTK=1 )
172
+		add_definitions(-DLEMMAUSEVTK) 
170 173
 	else()
171 174
 		ExternalProject_Add(VTK
172 175
   		GIT_REPOSITORY "https://gitlab.kitware.com/vtk/vtk.git"
@@ -213,7 +216,7 @@ if ( LEMMA_VTK8_SUPPORT )
213 216
 	  	    LOG_UPDATE 0
214 217
 		)
215 218
 	endif()
216
-	add_compile_options(-DLEMMAUSEVTK) 
219
+	add_definitions(-DLEMMAUSEVTK) 
217 220
 endif()
218 221
 
219 222
 #######################
@@ -225,7 +228,7 @@ endif()
225 228
 #############################
226 229
 FIND_LIBRARY( KIHA_EM1D kihaem1d ) 
227 230
 if ( KIHA_EM1D )
228
-	add_compile_options(-DKIHALEE_EM1D)
231
+	add_definitions(-DKIHALEE_EM1D) 
229 232
 endif()
230 233
 
231 234
 ####################

+ 2
- 0
Modules/LemmaCore/include/LemmaCore View File

@@ -13,6 +13,8 @@
13 13
  **/
14 14
 
15 15
 // Convenience include all of LemmaCore
16
+# pragma once
17
+
16 18
 #ifndef  LEMMAINCLUDE_INC
17 19
 #define  LEMMAINCLUDE_INC
18 20
 #include "ASCIIParser.h"

Loading…
Cancel
Save