clean code

Author: LiangliangNan

.gitignore

@@ -10,3 +10,4 @@ cmake-build-debug
 cmake-build-release
 cmake-build-minsizerel
 cmake-build-relwithdebinfo
+Release

3rd_party/easy3d/algo/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1)
 
 get_filename_component(MODULE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
-set(PROJECT_NAME 3rd_${MODULE_NAME})
+set(PROJECT_NAME easy3d_${MODULE_NAME})
 project(${PROJECT_NAME})
 
 
@@ -20,7 +20,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "3rd_party/easy3d")
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${ADTREE_easy3d_INCLUDE_DIR})
 
-target_link_libraries(${PROJECT_NAME} 3rd_core 3rd_util)
+target_link_libraries(${PROJECT_NAME} easy3d_core easy3d_util)
 
 if (MSVC)
     target_compile_definitions(${PROJECT_NAME} PRIVATE _CRT_SECURE_NO_DEPRECATE)

3rd_party/easy3d/core/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1)
 
 get_filename_component(MODULE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
-set(PROJECT_NAME 3rd_${MODULE_NAME})
+set(PROJECT_NAME easy3d_${MODULE_NAME})
 project(${PROJECT_NAME})
 
 

3rd_party/easy3d/fileio/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1)
 
 get_filename_component(MODULE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
-set(PROJECT_NAME 3rd_${MODULE_NAME})
+set(PROJECT_NAME easy3d_${MODULE_NAME})
 project(${PROJECT_NAME})
 
 
@@ -30,7 +30,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES FOLDER "3rd_party/easy3d")
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${ADTREE_easy3d_INCLUDE_DIR})
 
-target_link_libraries(${PROJECT_NAME} 3rd_core 3rd_rply 3rd_util)
+target_link_libraries(${PROJECT_NAME} easy3d_core 3rd_rply easy3d_util)
 
 if (MSVC)
     target_compile_definitions(${PROJECT_NAME} PRIVATE _CRT_SECURE_NO_DEPRECATE)

3rd_party/easy3d/util/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1)
 
 get_filename_component(MODULE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
-set(PROJECT_NAME 3rd_${MODULE_NAME})
+set(PROJECT_NAME easy3d_${MODULE_NAME})
 project(${PROJECT_NAME})
 
 

3rd_party/easy3d/viewer/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.1)
 
 get_filename_component(MODULE_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
-set(PROJECT_NAME 3rd_${MODULE_NAME})
+set(PROJECT_NAME easy3d_${MODULE_NAME})
 project(${PROJECT_NAME})
 
 
@@ -83,9 +83,8 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${ADTREE_glfw_INCLUDE_DIR})
 set (OpenGL_GL_PREFERENCE GLVND)
 find_package(OpenGL REQUIRED)
 message(STATUS "OpenGL libraries: ${OPENGL_LIBRARIES}")
-target_link_libraries(${PROJECT_NAME} ${OPENGL_LIBRARIES} 3rd_glew 3rd_glfw 3rd_core 3rd_util 3rd_fileio 3rd_tinyfiledialogs)
-
 target_compile_definitions(${PROJECT_NAME} PRIVATE GLEW_STATIC)
+target_link_libraries(${PROJECT_NAME} ${OPENGL_LIBRARIES} 3rd_glew 3rd_glfw easy3d_core easy3d_util easy3d_fileio 3rd_tinyfiledialogs)
 
 
 if (MSVC)

AdTree/CMakeLists.txt

@@ -59,7 +59,11 @@ if (APPLE)
             MACOSX_BUNDLE_BUNDLE_VERSION "1.0"
             MACOSX_BUNDLE_GUI_IDENTIFIER "liangliang.nan@gmail.com"
             )
-else ()
+elseif (WIN32 OR MSVC)
+	set(${PROJECT_NAME}_RESOURCES ${ADTREE_ROOT}/resources/AdTree.rc)
+    add_executable(${PROJECT_NAME} ${${PROJECT_NAME}_SOURCES} ${${PROJECT_NAME}_RESOURCES}) # you can add "WIN32" to disable the console window
+    message(STATUS "Creating the wxWidgets viewer with a console window")
+elseif (APPLE)
     add_executable(${PROJECT_NAME} ${${PROJECT_NAME}_SOURCES})
 endif ()
 
@@ -74,11 +78,10 @@ target_include_directories(${PROJECT_NAME} PRIVATE ${ADTREE_lm_INCLUDE_DIR})
 
 target_compile_definitions(${PROJECT_NAME} PRIVATE GLEW_STATIC)
 
-
 #set (OpenGL_GL_PREFERENCE GLVND)
 find_package(OpenGL REQUIRED)
 message(STATUS "OpenGL libraries: ${OPENGL_LIBRARIES}")
-target_link_libraries(${PROJECT_NAME} ${OPENGL_LIBRARIES} 3rd_imgui 3rd_algo 3rd_viewer 3rd_util 3rd_tetgen 3rd_kd_tree 3rd_cminpack 3rd_optimizer_lm)
+target_link_libraries(${PROJECT_NAME} ${OPENGL_LIBRARIES} 3rd_imgui easy3d_algo easy3d_viewer 3rd_tetgen 3rd_kd_tree 3rd_cminpack 3rd_optimizer_lm)
 
 
 find_package(Boost REQUIRED) # It's "Boost", not "BOOST" or "boost". Case matters.

CMakeLists.txt

@@ -8,8 +8,6 @@ endif ()
 get_filename_component(PROJECT_NAME ${CMAKE_CURRENT_SOURCE_DIR} NAME)
 project(${PROJECT_NAME})
 
-set(default_build_type "Release")
-
 ################################################################################
 
 set (CMAKE_CXX_STANDARD 11)
@@ -29,8 +27,6 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 ### Configuration
 set(ADTREE_ROOT "${CMAKE_CURRENT_LIST_DIR}")
-set(ADTREE_INCLUDE_DIR "${ADTREE_ROOT}")
-set(ADTREE_SOURCE_DIR "${ADTREE_ROOT}")
 set(ADTREE_EXTERNAL "${ADTREE_ROOT}/3rd_party")
 
 set(ADTREE_glew_INCLUDE_DIR "${ADTREE_EXTERNAL}/glew/include")

resources/AdTree.rc

@@ -0,0 +1,3 @@
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_ICON_MAIN ICON "icons/adtree.ico"