Skip to content

Commit 5ebc236

Browse files
aothmsaothms
committed
Update cmake and vcprojs to reference ICU correctly
1 parent 644ff7c commit 5ebc236

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

‎cmake/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ FIND_LIBRARY(icu "icuuc" /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64)
4040

4141
IF(icu)
4242
MESSAGE(STATUS "ICU libraries found")
43+
ADD_DEFINITIONS(-DHAVE_ICU)
4344
ELSE()
44-
MESSAGE(STATUS "Unable to find ICU library files, continuing")
45-
ADD_DEFINITIONS(-DHAVE_ICU)
45+
MESSAGE(STATUS "Unable to find ICU library files, continuing")
4646
ENDIF()
4747

4848
INCLUDE(CheckIncludeFileCXX)

‎win/IfcMax.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
/>
6262
<Tool
6363
Name="VCLinkerTool"
64-
AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib zlibdll.lib bmm.lib core.lib CustDlg.lib edmodel.lib expr.lib flt.lib geom.lib gfx.lib gup.lib helpsys.lib imageViewers.lib ManipSys.lib maxnet.lib Maxscrpt.lib maxutil.lib MenuMan.lib menus.lib mesh.lib MNMath.lib Paramblk2.lib particle.lib Poly.lib RenderUtil.lib SpringSys.lib tessint.lib viewfile.lib acap.lib TKerneld.lib TKMathd.lib TKBRepd.lib TKGeomBased.lib TKGeomAlgod.lib TKG3dd.lib TKG2dd.lib TKShHealingd.lib TKTopAlgod.lib TKMeshd.lib TKPrimd.lib TKBoold.lib TKBOd.lib TKFilletd.lib icuuc.lib"
64+
AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib zlibdll.lib bmm.lib core.lib CustDlg.lib edmodel.lib expr.lib flt.lib geom.lib gfx.lib gup.lib helpsys.lib imageViewers.lib ManipSys.lib maxnet.lib Maxscrpt.lib maxutil.lib MenuMan.lib menus.lib mesh.lib MNMath.lib Paramblk2.lib particle.lib Poly.lib RenderUtil.lib SpringSys.lib tessint.lib viewfile.lib acap.lib TKerneld.lib TKMathd.lib TKBRepd.lib TKGeomBased.lib TKGeomAlgod.lib TKG3dd.lib TKG2dd.lib TKShHealingd.lib TKTopAlgod.lib TKMeshd.lib TKPrimd.lib TKBoold.lib TKBOd.lib TKFilletd.lib"
6565
OutputFile="$(OutDir)\$(ProjectName).dli"
6666
ModuleDefinitionFile="..\src\ifcmax\ifcmax.def"
6767
GenerateDebugInformation="true"
@@ -136,7 +136,7 @@
136136
/>
137137
<Tool
138138
Name="VCLinkerTool"
139-
AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib zlibdll.lib bmm.lib core.lib CustDlg.lib edmodel.lib expr.lib flt.lib geom.lib gfx.lib gup.lib helpsys.lib imageViewers.lib ManipSys.lib maxnet.lib Maxscrpt.lib maxutil.lib MenuMan.lib menus.lib mesh.lib MNMath.lib Paramblk2.lib particle.lib Poly.lib RenderUtil.lib SpringSys.lib tessint.lib viewfile.lib acap.lib TKernel.lib TKMath.lib TKBRep.lib TKGeomBase.lib TKGeomAlgo.lib TKG3d.lib TKG2d.lib TKShHealing.lib TKTopAlgo.lib TKMesh.lib TKPrim.lib TKBool.lib TKBO.lib TKFillet.lib icuuc.lib"
139+
AdditionalDependencies="odbc32.lib odbccp32.lib comctl32.lib zlibdll.lib bmm.lib core.lib CustDlg.lib edmodel.lib expr.lib flt.lib geom.lib gfx.lib gup.lib helpsys.lib imageViewers.lib ManipSys.lib maxnet.lib Maxscrpt.lib maxutil.lib MenuMan.lib menus.lib mesh.lib MNMath.lib Paramblk2.lib particle.lib Poly.lib RenderUtil.lib SpringSys.lib tessint.lib viewfile.lib acap.lib TKernel.lib TKMath.lib TKBRep.lib TKGeomBase.lib TKGeomAlgo.lib TKG3d.lib TKG2d.lib TKShHealing.lib TKTopAlgo.lib TKMesh.lib TKPrim.lib TKBool.lib TKBO.lib TKFillet.lib"
140140
OutputFile="$(OutDir)\$(ProjectName).dli"
141141
ModuleDefinitionFile="..\src\ifcmax\ifcmax.def"
142142
GenerateDebugInformation="true"

‎win/IfcObj.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
/>
6161
<Tool
6262
Name="VCLinkerTool"
63-
AdditionalDependencies="TKerneld.lib TKMathd.lib TKBRepd.lib TKGeomBased.lib TKGeomAlgod.lib TKG3dd.lib TKG2dd.lib TKShHealingd.lib TKTopAlgod.lib TKMeshd.lib TKPrimd.lib TKBoold.lib TKBOd.lib TKFilletd.lib icuuc.lib"
63+
AdditionalDependencies="TKerneld.lib TKMathd.lib TKBRepd.lib TKGeomBased.lib TKGeomAlgod.lib TKG3dd.lib TKG2dd.lib TKShHealingd.lib TKTopAlgod.lib TKMeshd.lib TKPrimd.lib TKBoold.lib TKBOd.lib TKFilletd.lib"
6464
GenerateDebugInformation="true"
6565
TargetMachine="1"
6666
/>
@@ -130,7 +130,7 @@
130130
/>
131131
<Tool
132132
Name="VCLinkerTool"
133-
AdditionalDependencies="TKernel.lib TKMath.lib TKBRep.lib TKGeomBase.lib TKGeomAlgo.lib TKG3d.lib TKG2d.lib TKShHealing.lib TKTopAlgo.lib TKMesh.lib TKPrim.lib TKBool.lib TKBO.lib TKFillet.lib icuuc.lib"
133+
AdditionalDependencies="TKernel.lib TKMath.lib TKBRep.lib TKGeomBase.lib TKGeomAlgo.lib TKG3d.lib TKG2d.lib TKShHealing.lib TKTopAlgo.lib TKMesh.lib TKPrim.lib TKBool.lib TKBO.lib TKFillet.lib"
134134
GenerateDebugInformation="true"
135135
OptimizeReferences="2"
136136
EnableCOMDATFolding="2"

‎win/IfcParseExamples.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
/>
6161
<Tool
6262
Name="VCLinkerTool"
63-
AdditionalDependencies="icuuc.lib"
63+
AdditionalDependencies=""
6464
LinkIncremental="2"
6565
GenerateDebugInformation="true"
6666
SubSystem="1"
@@ -133,7 +133,7 @@
133133
/>
134134
<Tool
135135
Name="VCLinkerTool"
136-
AdditionalDependencies="icuuc.lib"
136+
AdditionalDependencies=""
137137
LinkIncremental="1"
138138
GenerateDebugInformation="true"
139139
SubSystem="1"

‎win/IfcWrap.vcproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
/>
6262
<Tool
6363
Name="VCLinkerTool"
64-
AdditionalDependencies="TKerneld.lib TKMathd.lib TKBRepd.lib TKGeomBased.lib TKGeomAlgod.lib TKG3dd.lib TKG2dd.lib TKShHealingd.lib TKTopAlgod.lib TKMeshd.lib TKPrimd.lib TKBoold.lib TKBOd.lib TKFilletd.lib icuuc.lib"
64+
AdditionalDependencies="TKerneld.lib TKMathd.lib TKBRepd.lib TKGeomBased.lib TKGeomAlgod.lib TKG3dd.lib TKG2dd.lib TKShHealingd.lib TKTopAlgod.lib TKMeshd.lib TKPrimd.lib TKBoold.lib TKBOd.lib TKFilletd.lib"
6565
OutputFile="$(OutDir)\_IfcImport.pyd"
6666
GenerateDebugInformation="true"
6767
TargetMachine="1"
@@ -132,7 +132,7 @@
132132
/>
133133
<Tool
134134
Name="VCLinkerTool"
135-
AdditionalDependencies="TKernel.lib TKMath.lib TKBRep.lib TKGeomBase.lib TKGeomAlgo.lib TKG3d.lib TKG2d.lib TKShHealing.lib TKTopAlgo.lib TKMesh.lib TKPrim.lib TKBool.lib TKBO.lib TKFillet.lib icuuc.lib"
135+
AdditionalDependencies="TKernel.lib TKMath.lib TKBRep.lib TKGeomBase.lib TKGeomAlgo.lib TKG3d.lib TKG2d.lib TKShHealing.lib TKTopAlgo.lib TKMesh.lib TKPrim.lib TKBool.lib TKBO.lib TKFillet.lib"
136136
OutputFile="$(OutDir)\_IfcImport.pyd"
137137
GenerateDebugInformation="true"
138138
OptimizeReferences="2"

0 commit comments

Comments
 (0)