Skip to content
Snippets Groups Projects
Commit fab1f00e authored by Mohcine Chraibi's avatar Mohcine Chraibi
Browse files

reorganize for IDE

parent b1c11809
No related branches found
No related tags found
No related merge requests found
...@@ -6,7 +6,6 @@ ...@@ -6,7 +6,6 @@
cmake_minimum_required(VERSION 3.1) cmake_minimum_required(VERSION 3.1)
set(CMAKE_LEGACY_CYGWIN_WIN32 0) set(CMAKE_LEGACY_CYGWIN_WIN32 0)
project(JPSreport) project(JPSreport)
IF (POLICY CMP0054) IF (POLICY CMP0054)
...@@ -157,6 +156,14 @@ if(BUILD_TESTING) ...@@ -157,6 +156,14 @@ if(BUILD_TESTING)
file(GLOB_RECURSE test_py_files "${CMAKE_TEST_DIR}/*runtest_*.py") file(GLOB_RECURSE test_py_files "${CMAKE_TEST_DIR}/*runtest_*.py")
endif(BUILD_TESTING) endif(BUILD_TESTING)
set(methods
methods/VoronoiDiagram.cpp
methods/PedData.cpp
methods/Method_A.cpp
methods/Method_B.cpp
methods/Method_C.cpp
methods/Method_D.cpp
)
set(source_files set(source_files
Analysis.cpp Analysis.cpp
IO/OutputHandler.cpp IO/OutputHandler.cpp
...@@ -165,12 +172,6 @@ set(source_files ...@@ -165,12 +172,6 @@ set(source_files
tinyxml/tinyxml.cpp tinyxml/tinyxml.cpp
tinyxml/tinyxmlerror.cpp tinyxml/tinyxmlerror.cpp
tinyxml/tinyxmlparser.cpp tinyxml/tinyxmlparser.cpp
methods/VoronoiDiagram.cpp
methods/PedData.cpp
methods/Method_A.cpp
methods/Method_B.cpp
methods/Method_C.cpp
methods/Method_D.cpp
geometry/Building.cpp geometry/Building.cpp
geometry/Line.cpp geometry/Line.cpp
geometry/Point.cpp geometry/Point.cpp
...@@ -289,7 +290,7 @@ endif() ...@@ -289,7 +290,7 @@ endif()
add_library ( geometrycore STATIC ${source_files} ) add_library ( geometrycore STATIC ${source_files} )
add_executable( add_executable(
jpsreport main.cpp jpsreport main.cpp ${methods}
) )
if (Boost_FOUND) if (Boost_FOUND)
target_link_libraries(geometrycore ${Boost_LIBRARIES}) target_link_libraries(geometrycore ${Boost_LIBRARIES})
...@@ -439,4 +440,3 @@ SET(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${JPSREPORT_VERSION}") ...@@ -439,4 +440,3 @@ SET(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${JPSREPORT_VERSION}")
SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${JPSREPORT_VERSION}") SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${JPSREPORT_VERSION}")
INCLUDE(CPack) INCLUDE(CPack)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment