Merge pull request #254 from stepcode/ks/installHdrs

mpictor · mpictor · commit 6963fc515de4 · 2013-08-29T17:14:19.000-07:00
Ks/installHdrs
diff --git a/AUTHORS b/AUTHORS
@@ -12,6 +12,7 @@ Loman, David (davidloman)
 Morrison, Christopher Sean (sean, morrison, brlcad)
 Paviot, Thomas (tpaviot)
 Pictor, Mark (mpictor)
+Shah, Kesha (kesha)
 Thomas, Dawn (homovulgaris, madant)
 Wouters, Dave (davyw)
 Yapp, Clifford (starseeker)
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -56,6 +56,18 @@ IF(COMMAND CMAKE_POLICY)
   CMAKE_POLICY(SET CMP0003 NEW)
 ENDIF(COMMAND CMAKE_POLICY)
 
+IF( NOT DEFINED INCLUDE_INSTALL_DIR )
+  SET( INCLUDE_INSTALL_DIR include )
+ENDIF( NOT DEFINED INCLUDE_INSTALL_DIR )
+
+IF( NOT DEFINED LIB_INSTALL_DIR )
+  SET( LIB_INSTALL_DIR lib )
+ENDIF( NOT DEFINED LIB_INSTALL_DIR )
+
+IF( NOT DEFINED BIN_INSTALL_DIR )
+  SET( BIN_INSTALL_DIR bin )
+ENDIF( NOT DEFINED BIN_INSTALL_DIR )
+
 IF( NOT DEFINED SC_BUILD_TYPE )
   SET( SC_BUILD_TYPE "Debug" CACHE STRING "Build type" ) # By default set debug build
 ENDIF( NOT DEFINED SC_BUILD_TYPE )
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
@@ -21,9 +21,20 @@ SET(express_HDRS
   express/type.h
   express/variable.h
 )
-install(FILES ${express_HDRS} DESTINATION include/express)
+install(FILES ${express_HDRS}
+	DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/express)
 
 SET(exppp_HDRS
   exppp/exppp.h
 )
-install(FILES ${exppp_HDRS} DESTINATION include/exppp)
+install(FILES ${exppp_HDRS}
+	DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/exppp)
+
+install(FILES ordered_attrs.h
+              sc_export.h
+              sc_stdbool.h
+	DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode)
+
+install(FILES ${CMAKE_BINARY_DIR}/include/sc_cf.h
+              ${CMAKE_BINARY_DIR}/include/sc_version_string.h
+	DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode)
diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt
@@ -6,6 +6,13 @@ set(SC_BASE_SOURCES
     sc_benchmark.cc
 )
 
+set(SC_BASE_HDRS
+        sc_benchmark.h
+        sc_memmgr.h
+        sc_getopt.h
+        sc_trace_fprintf.h
+)
+
 if(MINGW OR MSVC OR BORLAND)
 add_definitions( -DSC_BASE_DLL_EXPORTS )
 endif()
@@ -32,3 +39,6 @@ if(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/judy/src" )
     file( REMOVE "${CMAKE_CURRENT_SOURCE_DIR}/judy.tar.gz" )
     message( "Judy array source code extracted." )
 endif(NOT IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/judy/src" )
+
+install(FILES ${SC_BASE_HDRS}
+        DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/base)
diff --git a/src/cldai/CMakeLists.txt b/src/cldai/CMakeLists.txt
@@ -13,7 +13,7 @@ set(LIBSTEPDAI_SRCS
     sdaiString.cc
 )
 
-SET(LIBSTEPDAI_PRIVATE_HDRS
+SET(SC_CLDAI_HDRS
     sdaiApplication_instance_set.h
     sdaiBinary.h
     sdaiDaObject.h
@@ -25,7 +25,6 @@ SET(LIBSTEPDAI_PRIVATE_HDRS
     sdaiObject.h
     sdaiSession_instance.h
     sdaiString.h
-    StrUtil.hh
 )
 
 include_directories(
@@ -36,3 +35,6 @@ include_directories(
 )
 
 SC_ADDLIB(stepdai "${LIBSTEPDAI_SRCS}" "steputils;base")
+
+install(FILES ${SC_CLDAI_HDRS}
+	DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/cldai)
diff --git a/src/cleditor/CMakeLists.txt b/src/cleditor/CMakeLists.txt
@@ -9,7 +9,7 @@ set(LIBSTEPEDITOR_SRCS
     SdaiSchemaInit.cc
 )
 
-SET(LIBSTEPEDITOR_PRIVATE_HDRS
+SET(SC_CLEDITOR_HDRS
     STEPfile.h
     cmdmgr.h
     editordefines.h
@@ -28,3 +28,6 @@ include_directories(
 )
 
 SC_ADDLIB(stepeditor "${LIBSTEPEDITOR_SRCS}" "stepcore;stepdai;steputils;base")
+
+install(FILES ${SC_CLEDITOR_HDRS}
+	DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/cleditor)
diff --git a/src/cllazyfile/CMakeLists.txt b/src/cllazyfile/CMakeLists.txt
@@ -1,8 +1,27 @@
 
-set( clLazyFile_SRCS lazyDataSectionReader.cc lazyFileReader.cc lazyInstMgr.cc p21HeaderSectionReader.cc sectionReader.cc lazyP21DataSectionReader.cc ../base/judy/src/judy.c ../base/judy/src/judyLArray.h ../base/judy/src/judySArray.h )
+set( clLazyFile_SRCS
+     lazyDataSectionReader.cc 
+     lazyFileReader.cc
+     lazyInstMgr.cc
+     p21HeaderSectionReader.cc
+     sectionReader.cc
+     lazyP21DataSectionReader.cc
+     ../base/judy/src/judy.c
+     ../base/judy/src/judyLArray.h
+     ../base/judy/src/judySArray.h 
+)
 
-set( clLazyFile_HDRS headerSectionReader.h lazyFileReader.h lazyP21DataSectionReader.h p21HeaderSectionReader.h
-lazyDataSectionReader.h lazyInstMgr.h lazyTypes.h sectionReader.h )
+set( SC_CLLAZYFILE_HDRS
+     headerSectionReader.h
+     lazyFileReader.h
+     lazyP21DataSectionReader.h
+     p21HeaderSectionReader.h
+     lazyDataSectionReader.h
+     lazyInstMgr.h
+     lazyTypes.h
+     sectionReader.h
+     instMgrHelper.h
+)
 
 include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}
@@ -17,3 +36,6 @@ include_directories(
 SC_ADDLIB(steplazyfile "${clLazyFile_SRCS};${clLazyFile_HDRS}" "stepcore;stepdai;steputils;base")
 SC_ADDEXEC(lazy_test "lazy_test.cc" "steplazyfile;stepeditor" )
 set_target_properties(lazy_test PROPERTIES COMPILE_FLAGS "-DNO_REGISTRY" )
+
+install(FILES ${SC_CLLAZYFILE_HDRS}
+        DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/cllazyfile)
diff --git a/src/clstepcore/CMakeLists.txt b/src/clstepcore/CMakeLists.txt
@@ -34,7 +34,7 @@ set(LIBSTEPCORE_SRCS
     needFunc.cc
 )
 
-SET(LIBSTEPCORE_PRIVATE_HDRS
+SET(SC_CLSTEPCORE_HDRS
     baseType.h
     complexSupport.h
     dictdefs.h
@@ -57,6 +57,7 @@ SET(LIBSTEPCORE_PRIVATE_HDRS
     dispnode.h
     dispnodelist.h
     needFunc.h
+    SubSuperIterators.h
 )
 
 include_directories(
@@ -68,3 +69,6 @@ include_directories(
 )
 
 SC_ADDLIB(stepcore "${LIBSTEPCORE_SRCS}" "steputils;stepdai;base")
+
+install(FILES ${SC_CLSTEPCORE_HDRS}
+	DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/clstepcore)
diff --git a/src/clutils/CMakeLists.txt b/src/clutils/CMakeLists.txt
@@ -9,7 +9,7 @@ set(LIBSTEPUTILS_SRCS
     errordesc.cc 
 )
 
-SET(LIBSTEPUTILS_PRIVATE_HDRS
+SET(SC_CLUTILS_HDRS
     dirobj.h
     errordesc.h
     gennodearray.h
@@ -30,3 +30,6 @@ SC_ADDLIB(steputils "${LIBSTEPUTILS_SRCS}" "base")
 IF(MINGW OR MSVC OR BORLAND)
     TARGET_LINK_LIBRARIES(steputils shlwapi.lib)
 ENDIF()
+
+install(FILES ${SC_CLUTILS_HDRS}
+	DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/clutils)

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ set(LIBSTEPDAI_SRCS`
`13`	`13`	`sdaiString.cc`
`14`	`14`	`)`
`15`	`15`
`16`		`-SET(LIBSTEPDAI_PRIVATE_HDRS`
	`16`	`+SET(SC_CLDAI_HDRS`
`17`	`17`	`sdaiApplication_instance_set.h`
`18`	`18`	`sdaiBinary.h`
`19`	`19`	`sdaiDaObject.h`
`@@ -25,7 +25,6 @@ SET(LIBSTEPDAI_PRIVATE_HDRS`
`25`	`25`	`sdaiObject.h`
`26`	`26`	`sdaiSession_instance.h`
`27`	`27`	`sdaiString.h`
`28`		`- StrUtil.hh`
`29`	`28`	`)`
`30`	`29`
`31`	`30`	`include_directories(`
`@@ -36,3 +35,6 @@ include_directories(`
`36`	`35`	`)`
`37`	`36`
`38`	`37`	`SC_ADDLIB(stepdai "${LIBSTEPDAI_SRCS}" "steputils;base")`
	`38`	`+`
	`39`	`+install(FILES ${SC_CLDAI_HDRS}`
	`40`	`+ DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/cldai)`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ set(LIBSTEPEDITOR_SRCS`
`9`	`9`	`SdaiSchemaInit.cc`
`10`	`10`	`)`
`11`	`11`
`12`		`-SET(LIBSTEPEDITOR_PRIVATE_HDRS`
	`12`	`+SET(SC_CLEDITOR_HDRS`
`13`	`13`	`STEPfile.h`
`14`	`14`	`cmdmgr.h`
`15`	`15`	`editordefines.h`
`@@ -28,3 +28,6 @@ include_directories(`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`SC_ADDLIB(stepeditor "${LIBSTEPEDITOR_SRCS}" "stepcore;stepdai;steputils;base")`
	`31`	`+`
	`32`	`+install(FILES ${SC_CLEDITOR_HDRS}`
	`33`	`+ DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/cleditor)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ set(LIBSTEPCORE_SRCS`
`34`	`34`	`needFunc.cc`
`35`	`35`	`)`
`36`	`36`
`37`		`-SET(LIBSTEPCORE_PRIVATE_HDRS`
	`37`	`+SET(SC_CLSTEPCORE_HDRS`
`38`	`38`	`baseType.h`
`39`	`39`	`complexSupport.h`
`40`	`40`	`dictdefs.h`
`@@ -57,6 +57,7 @@ SET(LIBSTEPCORE_PRIVATE_HDRS`
`57`	`57`	`dispnode.h`
`58`	`58`	`dispnodelist.h`
`59`	`59`	`needFunc.h`
	`60`	`+ SubSuperIterators.h`
`60`	`61`	`)`
`61`	`62`
`62`	`63`	`include_directories(`
`@@ -68,3 +69,6 @@ include_directories(`
`68`	`69`	`)`
`69`	`70`
`70`	`71`	`SC_ADDLIB(stepcore "${LIBSTEPCORE_SRCS}" "steputils;stepdai;base")`
	`72`	`+`
	`73`	`+install(FILES ${SC_CLSTEPCORE_HDRS}`
	`74`	`+ DESTINATION ${INCLUDE_INSTALL_DIR}/stepcode/clstepcore)`