Skip to content

Commit 5cf8fc1

Browse files
starseekerstarseeker
committed
Merge branch 'develop'
v0.8.2
2 parents 131fe6e + c0d3fac commit 5cf8fc1

File tree

243 files changed

+682
-3760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

243 files changed

+682
-3760
lines changed

‎cmake/FindLEMON.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ if (LEMON_EXECUTABLE)
141141

142142
# execute lemon
143143
add_custom_command(
144-
OUTPUT ${_out_src_file}
144+
OUTPUT ${_out_src_file} ${_basename}.h
145145
COMMAND ${LEMON_EXECUTABLE} -T${LEMON_TEMPLATE} ${LEMON_EXECUTABLE_opts} ${_in_y_file}
146146
DEPENDS ${Name}_input_cpy
147147
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
@@ -152,7 +152,7 @@ if (LEMON_EXECUTABLE)
152152
add_custom_command(
153153
OUTPUT ${_out_hdr_file}
154154
COMMAND ${CMAKE_COMMAND} ARGS -E rename ${_basename}.h ${_out_hdr_file}
155-
DEPENDS ${_out_src_file}
155+
DEPENDS ${_out_src_file} ${_basename}.h
156156
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
157157
)
158158

‎example/ap203min/CMakeLists.txt‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,6 @@ add_subdirectory(${STEPCODE_ROOT_DIR} "${CMAKE_CURRENT_BINARY_DIR}/sc" EXCLUDE_F
5858

5959
# Set up STEPcode include directories.
6060
set(STEPCODE_INCLUDE_DIR
61-
${STEPCODE_ROOT_DIR}/src/clstepcore
62-
${STEPCODE_ROOT_DIR}/src/cldai
63-
${STEPCODE_ROOT_DIR}/src/clutils
64-
${STEPCODE_ROOT_DIR}/src/cleditor
6561
${STEPCODE_BUILD_DIR}/include
6662
${STEPCODE_ROOT_DIR}/include
6763
${CMAKE_BINARY_DIR}

‎example/ap203min/ap203min.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,15 @@
4949
// $./AP203Minimum
5050
// AP203Minimum outfile.stp
5151

52-
#include <STEPfile.h>
53-
#include <sdai.h>
54-
#include <STEPattribute.h>
55-
#include <ExpDict.h>
56-
#include <Registry.h>
57-
#include <errordesc.h>
58-
59-
#include <STEPcomplex.h>
60-
#include <SdaiHeaderSchema.h>
52+
#include <cleditor/STEPfile.h>
53+
#include <clstepcore/sdai.h>
54+
#include <clstepcore/STEPattribute.h>
55+
#include <clstepcore/ExpDict.h>
56+
#include <clstepcore/Registry.h>
57+
#include <clutils/errordesc.h>
58+
59+
#include <clstepcore/STEPcomplex.h>
60+
#include <cleditor/SdaiHeaderSchema.h>
6161

6262
#include "schema.h"
6363

‎include/CMakeLists.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,12 @@ install(FILES ordered_attrs.h
3737
install(FILES ${SC_BINARY_DIR}/${INCLUDE_DIR}/config.h
3838
DESTINATION ${INCLUDE_DIR}/stepcode)
3939

40+
add_subdirectory(cldai)
41+
add_subdirectory(cleditor)
42+
add_subdirectory(cllazyfile)
43+
add_subdirectory(clstepcore)
44+
add_subdirectory(clutils)
45+
4046
# Local Variables:
4147
# tab-width: 8
4248
# mode: cmake

‎include/cldai/CMakeLists.txt‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
set(DAI_HDRS
2+
sdaiApplication_instance_set.h
3+
sdaiBinary.h
4+
sdaiDaObject.h
5+
sdaiEntity_extent.h
6+
sdaiEntity_extent_set.h
7+
sdaiEnum.h
8+
sdaiModel_contents.h
9+
sdaiModel_contents_list.h
10+
sdaiObject.h
11+
sdaiSession_instance.h
12+
sdaiString.h
13+
)
14+
15+
install(FILES ${DAI_HDRS}
16+
DESTINATION ${INCLUDE_DIR}/stepcode/cldai)
17+
18+
# Local Variables:
19+
# tab-width: 8
20+
# mode: cmake
21+
# indent-tabs-mode: t
22+
# End:
23+
# ex: shiftwidth=2 tabstop=8
24+

src/cldai/sdaiApplication_instance_set.h renamed to include/cldai/sdaiApplication_instance_set.h

File renamed without changes.

src/cldai/sdaiBinary.h renamed to include/cldai/sdaiBinary.h

File renamed without changes.

src/cldai/sdaiDaObject.h renamed to include/cldai/sdaiDaObject.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#ifndef SDAIDAOBJECT_H
22
#define SDAIDAOBJECT_H 1
33

4-
#include <sdaiObject.h>
5-
#include <sdaiString.h>
6-
#include <sdaiEnum.h>
4+
#include "cldai/sdaiObject.h"
5+
#include "cldai/sdaiString.h"
6+
#include "cldai/sdaiEnum.h"
77

88
#include <sc_export.h>
99

src/cldai/sdaiEntity_extent.h renamed to include/cldai/sdaiEntity_extent.h

File renamed without changes.

src/cldai/sdaiEntity_extent_set.h renamed to include/cldai/sdaiEntity_extent_set.h

File renamed without changes.

0 commit comments

Comments
 (0)