Skip to content

Commit

Permalink
fix CMake
Browse files Browse the repository at this point in the history
  • Loading branch information
Amazingkivas committed Nov 1, 2023
1 parent 9e6800c commit 5cc74cb
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 14 deletions.
6 changes: 1 addition & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,9 @@ project(FDTD)

include_directories(include gtest)


# BUILD
add_subdirectory(include)
add_subdirectory(samples)
add_subdirectory(test)
add_subdirectory(gtest)

set_target_properties(FDTD PROPERTIES
FOLDER "sln")

configure_file(${CMAKE_SOURCE_DIR}/FDTD.sln ${CMAKE_BINARY_DIR}/sln/FDTD.sln COPYONLY)
3 changes: 0 additions & 3 deletions gtest/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,3 @@ target_link_libraries(${target} ${pthread})

set_target_properties(${target} PROPERTIES
FOLDER "sln")

configure_file(${CMAKE_SOURCE_DIR}/gtest/gtest.vcxproj ${CMAKE_BINARY_DIR}/sln/gtest/gtest.vcxproj COPYONLY)
configure_file(${CMAKE_SOURCE_DIR}/gtest/gtest.vcxproj.filters ${CMAKE_BINARY_DIR}/sln/gtest/gtest.vcxproj.filters COPYONLY)
6 changes: 6 additions & 0 deletions include/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
set(target "FDTD")

add_library(${target} STATIC FDTD.h ../src/FDTD.cpp)

set_target_properties(${target} PROPERTIES
FOLDER "sln")
3 changes: 0 additions & 3 deletions samples/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,3 @@ set_target_properties(sample PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY

set_target_properties(sample PROPERTIES
FOLDER "sln")

configure_file(${CMAKE_SOURCE_DIR}/samples/sample.vcxproj ${CMAKE_BINARY_DIR}/sln/samples/sample.vcxproj COPYONLY)
configure_file(${CMAKE_SOURCE_DIR}/samples/sample.vcxproj.filters ${CMAKE_BINARY_DIR}/sln/samples/sample.vcxproj.filters COPYONLY)
3 changes: 0 additions & 3 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,3 @@ target_link_libraries(${target} gtest)

set_target_properties(${target} PROPERTIES
FOLDER "sln")

configure_file(${CMAKE_SOURCE_DIR}/test/FDTD_test.vcxproj ${CMAKE_BINARY_DIR}/sln/tests/FDTD_test.vcxproj COPYONLY)
configure_file(${CMAKE_SOURCE_DIR}/test/FDTD_test.vcxproj.filters ${CMAKE_BINARY_DIR}/sln/tests/FDTD_test.vcxproj.filters COPYONLY)

0 comments on commit 5cc74cb

Please sign in to comment.