Skip to content

Commit 1229e47

Browse files
committed
merge to latest version 12 and various cmake improvements
1 parent 06055bb commit 1229e47

File tree

187 files changed

+24252
-94626
lines changed

Some content is hidden

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

187 files changed

+24252
-94626
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@
55
/Bin/
66
*.opensdf
77
*.bat
8+
*.zip
9+
.vs/*

CMakeLists.txt

Lines changed: 12 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set(CMAKE_DISABLE_SOURCE_CHANGES ON)
44
set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
55
set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
66

7-
project(PoissonRecon)
7+
project(PoissonRecon LANGUAGES CXX)
88

99
if(MSVC)
1010
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
@@ -13,34 +13,8 @@ if(MSVC)
1313
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
1414
endif()
1515

16-
if(MSVC)
17-
if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
18-
string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
19-
else()
20-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
21-
endif()
22-
# Enable multi-thread compilation
23-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
24-
# Disable warnings on Windows
25-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4127 /bigobj") # condition is constant
26-
# Enable additional warnings on Windows
27-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp -lgomp -fpermissive")
28-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp -lgomp -fpermissive")
29-
elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
30-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpedantic ")
31-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp -lgomp -fpermissive")
32-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp -lgomp -fpermissive")
33-
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
34-
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
35-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wpedantic ")
36-
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fpermissive")
37-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
38-
endif()
39-
40-
option(DEBUG "Enable debugging information" OFF)
41-
4216
if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") OR CMAKE_COMPILER_IS_GNUCC
43-
OR CMAKE_COMPILER_IS_GNUCXX)
17+
OR CMAKE_COMPILER_IS_GNUCXX)
4418
if(DEBUG)
4519
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -Winline")
4620
else()
@@ -52,29 +26,25 @@ message(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
5226

5327
if(NOT TARGET uninstall)
5428
configure_file(
55-
${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in
56-
${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake
57-
IMMEDIATE @ONLY)
29+
${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in
30+
${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake IMMEDIATE @ONLY)
5831

59-
add_custom_target(uninstall
60-
COMMAND ${CMAKE_COMMAND} -P
61-
${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
32+
add_custom_target(
33+
uninstall COMMAND ${CMAKE_COMMAND} -P
34+
${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
6235
endif()
6336

64-
export(TARGETS
65-
FILE ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}Targets.cmake)
37+
export(TARGETS FILE ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}Targets.cmake)
6638

67-
file(WRITE
68-
${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}Config.cmake
69-
"include(\${CMAKE_CURRENT_LIST_DIR}/${CMAKE_PROJECT_NAME}Targets.cmake)\n")
39+
file(WRITE ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}Config.cmake
40+
"include(CMakeFindDependencyMacro)\n"
41+
"include(\${CMAKE_CURRENT_LIST_DIR}/${CMAKE_PROJECT_NAME}Targets.cmake)\n")
7042

7143
add_subdirectory(modules)
7244
add_subdirectory(apps)
7345

74-
install(FILES
75-
${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}Config.cmake
46+
install(FILES ${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}Config.cmake
7647
DESTINATION lib/cmake/${CMAKE_PROJECT_NAME})
7748

7849
install(EXPORT ${CMAKE_PROJECT_NAME}Targets
7950
DESTINATION lib/cmake/${CMAKE_PROJECT_NAME})
80-

JPEG/Makefile

Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
 (0)