ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/REPOS_ERICCA/magic/CMakeLists.txt

Comparing magic/CMakeLists.txt (file contents):
Revision 350 by francois, Thu Jul 5 15:45:40 2012 UTC vs.
Revision 381 by francois, Sat Dec 8 22:29:43 2012 UTC

#	Line 17 | Line 17 | option(ENABLE_STEP "Magic Enable Step" O
17		option(ENABLE_IBREP "Magic Enable IBREP" OFF)
18		option(ENABLE_NUTIL "Magic Enable NUTIL (pour la visu VTK)" OFF)
19		option(ENABLE_TEST "Magic Enable test" OFF)
20	+	option(ENABLE_ENGLISH "Magic Use English" OFF)
21
22
23		set(CADXFEM_PATH "../cadxfem" CACHE STRING "CADXFEM Path")
#	Line 74 | Line 75 | if(ENABLE_OCC)
75		endif(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)
76		endif(ENABLE_OCC)
77
78	+	execute_process(COMMAND "date" "+%Y" OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE annee)
79	+	execute_process(COMMAND "date" "+%Y" OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_VARIABLE dateannee)
80	+	SET(ANNEE -DVERSION=\"${annee}\")
81	+	SET(DATEANNEE -DDATEVERSION=\"1999-${dateannee}\")
82	+
83	+	add_definitions(${ANNEE})
84	+	add_definitions(${DATEANNEE})
85	+
86	+
87		if(ENABLE_SAT)
88		add_definitions(-DBREP_SAT)
89		endif(ENABLE_SAT)
#	Line 85 | Line 95 | if(ENABLE_STEP)
95		add_definitions(-DBREP_STEP)
96		endif(ENABLE_STEP)
97
98	<
98	>	if (ENABLE_ENGLISH)
99	>	add_definitions(-DUSE_ENGLISH)
100	>	endif(ENABLE_ENGLISH)
101
102		if(ENABLE_IBREP)
103		add_subdirectory(${CADXFEM_PATH}/IBrep "${CMAKE_CURRENT_BINARY_DIR}/IBrep")
104	<
104	>	add_definitions(-DIBREP)
105		endif(ENABLE_IBREP)
106		if(ENABLE_NUTIL)
107		add_subdirectory(${CADXFEM_PATH}/nutil "${CMAKE_CURRENT_BINARY_DIR}/nutil")
108	<
108	>	add_definitions(-DVTK_INTERFACE)
109		endif(ENABLE_NUTIL)
110
111	+	message(STATUS "Configuration de MAGiC${annee}:1999-${dateannee}")
112	+
113	+
114	+
115		add_subdirectory(lib)
116		add_subdirectory(app)
117

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines