Skip to content

Commit 59735d2

Browse files
committed
Refactor codes to avoid file name conflicts
1 parent 0011239 commit 59735d2

File tree

10 files changed

+391
-459
lines changed

10 files changed

+391
-459
lines changed

CMakeLists.txt

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,30 @@ if (CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
1010
set(CMAKE_Fortran_FLAGS "-ffree-line-length-none")
1111
elseif (CMAKE_Fortran_COMPILER_ID STREQUAL "PGI")
1212
endif ()
13-
set(CMAKE_Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}")
13+
set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR})
1414

1515
set(sources
16-
src/string_mod.F90
17-
src/log_mod.F90
1816
src/assert_mod.F90
17+
src/test_common_mod.F90
1918
src/test_case_mod.F90
19+
src/test_suite_mod.F90
2020
src/unit_test.F90
2121
)
2222

23-
if (PARENT_DIRECTORY)
23+
get_directory_property(has_parent PARENT_DIRECTORY)
24+
25+
if (has_parent)
2426
include_directories(${CMAKE_BINARY_DIR})
2527
endif ()
2628

2729
add_library(fortran_unit_test SHARED ${sources})
2830
set_property(TARGET fortran_unit_test PROPERTY VERSION ${version})
2931
set_property(TARGET fortran_unit_test PROPERTY SOVERSION 1)
3032

31-
add_executable(test_log src/test/test_log.F90)
32-
target_link_libraries(test_log fortran_unit_test)
33-
34-
add_executable(test_assert src/test/test_assert.F90)
35-
target_link_libraries(test_assert fortran_unit_test)
33+
if (NOT has_parent)
34+
add_executable(assert_test.exe src/assert_test.F90)
35+
target_link_libraries(assert_test.exe fortran_unit_test)
36+
endif ()
3637

3738
install(TARGETS fortran_unit_test EXPORT FortranUnitTestTargets
3839
ARCHIVE DESTINATION lib

src/assert_mod.F90

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
module assert_mod
22

3-
use log_mod
4-
use string_mod
3+
use test_common_mod
54
use test_case_mod
65

76
implicit none
File renamed without changes.

src/log_mod.F90

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

src/string_mod.F90

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

src/test/test_log.F90

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

0 commit comments

Comments
 (0)