Merge pull request #24 from nmellado/bugfix_23

Bugfix 23: add macosx compilation support
nmellado · Dec 7, 2016 · 3f3b150 · 3f3b150
2 parents 2d7073b + a91777c
commit 3f3b150
Show file tree

Hide file tree

Showing 29 changed files with 9 additions and 9 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ project (Super4PCS)
 
 set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
 
-set(SRC_DIR ${PROJECT_SOURCE_DIR}/super4pcs)
+set(SRC_DIR ${PROJECT_SOURCE_DIR}/src/super4pcs/)
 
 ################################################################################
 ## Configuration file 

diff --git a/Super4PCS.sln b/Super4PCS.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.23107.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Super4pcs", "Super4pcs\Super4pcs.vcxproj", "{EC169232-18F7-4DD8-9DEB-6AEF670BDD99}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Super4pcs", "src\Super4pcs\Super4pcs.vcxproj", "{EC169232-18F7-4DD8-9DEB-6AEF670BDD99}"
 	ProjectSection(ProjectDependencies) = postProject
 		{A7D00B21-CB9C-4BBB-8DEE-51025104F867} = {A7D00B21-CB9C-4BBB-8DEE-51025104F867}
 		{FE684FAA-7321-32F9-A0BD-0DA034AAB6FF} = {FE684FAA-7321-32F9-A0BD-0DA034AAB6FF}

diff --git a/super4pcs/4pcs.cc → src/super4pcs/4pcs.cc b/super4pcs/4pcs.cc → src/super4pcs/4pcs.cc
diff --git a/super4pcs/4pcs.h → src/super4pcs/4pcs.h b/super4pcs/4pcs.h → src/super4pcs/4pcs.h
diff --git a/super4pcs/Super4pcs.vcxproj → src/super4pcs/Super4pcs.vcxproj b/super4pcs/Super4pcs.vcxproj → src/super4pcs/Super4pcs.vcxproj
@@ -19,15 +19,15 @@
     </ProjectConfiguration>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\3rdparty\chealpix\src\chealpix.c" />
+    <ClCompile Include="..\..\3rdparty\chealpix\src\chealpix.c" />
     <ClCompile Include="4pcs.cc" />
     <ClCompile Include="accelerators\normalHealSet.cpp" />
     <ClCompile Include="io\io.cc" />
     <ClCompile Include="super4pcs.cc" />
     <ClCompile Include="super4pcs_test.cc" />
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\3rdparty\chealpix\include\chealpix.h" />
+    <ClInclude Include="..\..\3rdparty\chealpix\include\chealpix.h" />
     <ClInclude Include="4pcs.h" />
     <ClInclude Include="accelerators\bbox.h" />
     <ClInclude Include="accelerators\kdtree.h" />
@@ -108,7 +108,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LibraryPath>$(SolutionDir)\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
-    <IncludePath>$(ProjectDir)..\3rdparty\ann_1.1.2\include;$(ProjectDir)..\3rdparty\chealpix\include;$(ProjectDir);$(ProjectDir)io;$(ProjectDir)accelerators;$(IncludePath)</IncludePath>
+    <IncludePath>$(ProjectDir)..\..\3rdparty\ann_1.1.2\include;$(ProjectDir)..\..\3rdparty\chealpix\include;$(ProjectDir);$(ProjectDir)io;$(ProjectDir)accelerators;$(IncludePath)</IncludePath>
     <IntDir>$(SolutionDir)build\$(Platform)\$(Configuration)\</IntDir>
     <OutDir>$(SolutionDir)\$(Platform)\$(Configuration)\</OutDir>
   </PropertyGroup>

diff --git a/super4pcs/Super4pcs.vcxproj.filters → src/super4pcs/Super4pcs.vcxproj.filters b/super4pcs/Super4pcs.vcxproj.filters → src/super4pcs/Super4pcs.vcxproj.filters
@@ -40,7 +40,7 @@
     <ClCompile Include="super4pcs_test.cc">
       <Filter>Source Files\super4pcs</Filter>
     </ClCompile>
-    <ClCompile Include="..\3rdparty\chealpix\src\chealpix.c">
+    <ClCompile Include="..\..\3rdparty\chealpix\src\chealpix.c">
       <Filter>Source Files\3rdParty</Filter>
     </ClCompile>
   </ItemGroup>
@@ -96,12 +96,12 @@
     <ClInclude Include="shared4pcs.h">
       <Filter>Source Files\super4pcs</Filter>
     </ClInclude>
-    <ClInclude Include="..\3rdparty\chealpix\include\chealpix.h">
-      <Filter>Source Files\3rdParty</Filter>
-    </ClInclude>
     <ClInclude Include="utils\disablewarnings.h">
       <Filter>Source Files\super4pcs\utils</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\3rdparty\chealpix\include\chealpix.h">
+      <Filter>Source Files\3rdParty</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="accelerators\CMakeLists.txt">

diff --git a/super4pcs/accelerators/CMakeLists.txt → src/super4pcs/accelerators/CMakeLists.txt b/super4pcs/accelerators/CMakeLists.txt → src/super4pcs/accelerators/CMakeLists.txt
diff --git a/super4pcs/accelerators/bbox.h → src/super4pcs/accelerators/bbox.h b/super4pcs/accelerators/bbox.h → src/super4pcs/accelerators/bbox.h
diff --git a/super4pcs/accelerators/kdtree.h → src/super4pcs/accelerators/kdtree.h b/super4pcs/accelerators/kdtree.h → src/super4pcs/accelerators/kdtree.h
diff --git a/super4pcs/accelerators/normalHealSet.cpp → src/super4pcs/accelerators/normalHealSet.cpp b/super4pcs/accelerators/normalHealSet.cpp → src/super4pcs/accelerators/normalHealSet.cpp
diff --git a/super4pcs/accelerators/normalHealSet.h → src/super4pcs/accelerators/normalHealSet.h b/super4pcs/accelerators/normalHealSet.h → src/super4pcs/accelerators/normalHealSet.h
diff --git a/super4pcs/accelerators/normalset.h → src/super4pcs/accelerators/normalset.h b/super4pcs/accelerators/normalset.h → src/super4pcs/accelerators/normalset.h
diff --git a/super4pcs/accelerators/normalset.hpp → src/super4pcs/accelerators/normalset.hpp b/super4pcs/accelerators/normalset.hpp → src/super4pcs/accelerators/normalset.hpp
diff --git a/...rators/pairExtraction/bruteForceFunctor.h → ...rators/pairExtraction/bruteForceFunctor.h b/...rators/pairExtraction/bruteForceFunctor.h → ...rators/pairExtraction/bruteForceFunctor.h
diff --git a/...tors/pairExtraction/intersectionFunctor.h → ...tors/pairExtraction/intersectionFunctor.h b/...tors/pairExtraction/intersectionFunctor.h → ...tors/pairExtraction/intersectionFunctor.h
diff --git a/...erators/pairExtraction/intersectionNode.h → ...erators/pairExtraction/intersectionNode.h b/...erators/pairExtraction/intersectionNode.h → ...erators/pairExtraction/intersectionNode.h
diff --git a/...rs/pairExtraction/intersectionPrimitive.h → ...rs/pairExtraction/intersectionPrimitive.h b/...rs/pairExtraction/intersectionPrimitive.h → ...rs/pairExtraction/intersectionPrimitive.h
diff --git a/super4pcs/accelerators/utils.h → src/super4pcs/accelerators/utils.h b/super4pcs/accelerators/utils.h → src/super4pcs/accelerators/utils.h
diff --git a/super4pcs/io/CMakeLists.txt → src/super4pcs/io/CMakeLists.txt b/super4pcs/io/CMakeLists.txt → src/super4pcs/io/CMakeLists.txt
diff --git a/super4pcs/io/io.cc → src/super4pcs/io/io.cc b/super4pcs/io/io.cc → src/super4pcs/io/io.cc
diff --git a/super4pcs/io/io.h → src/super4pcs/io/io.h b/super4pcs/io/io.h → src/super4pcs/io/io.h
diff --git a/super4pcs/io/io_ply.h → src/super4pcs/io/io_ply.h b/super4pcs/io/io_ply.h → src/super4pcs/io/io_ply.h
diff --git a/super4pcs/pairCreationFunctor.h → src/super4pcs/pairCreationFunctor.h b/super4pcs/pairCreationFunctor.h → src/super4pcs/pairCreationFunctor.h
diff --git a/super4pcs/pairExtraction.h → src/super4pcs/pairExtraction.h b/super4pcs/pairExtraction.h → src/super4pcs/pairExtraction.h
diff --git a/super4pcs/shared4pcs.h → src/super4pcs/shared4pcs.h b/super4pcs/shared4pcs.h → src/super4pcs/shared4pcs.h
diff --git a/super4pcs/super4pcs.cc → src/super4pcs/super4pcs.cc b/super4pcs/super4pcs.cc → src/super4pcs/super4pcs.cc
diff --git a/super4pcs/super4pcs_test.cc → src/super4pcs/super4pcs_test.cc b/super4pcs/super4pcs_test.cc → src/super4pcs/super4pcs_test.cc
diff --git a/super4pcs/utils/disablewarnings.h → src/super4pcs/utils/disablewarnings.h b/super4pcs/utils/disablewarnings.h → src/super4pcs/utils/disablewarnings.h
diff --git a/super4pcs/utils/timer.h → src/super4pcs/utils/timer.h b/super4pcs/utils/timer.h → src/super4pcs/utils/timer.h