Skip to content

Commit 523b2c6

Browse files
committed
update
1 parent 16a79f9 commit 523b2c6

File tree

8 files changed

+33
-18
lines changed

8 files changed

+33
-18
lines changed

Project1/CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
file(GLOB Project1_SRC
2-
"src/*.cpp"
3-
)
1+
file(GLOB Project1_SRC "src/*.cpp")
42
include_directories(.)
53
add_library(Project1 STATIC ${Project1_SRC})
64
set_property(TARGET Project1 PROPERTY POSITION_INDEPENDENT_CODE ON)
7-
add_executable(Project1Exec ${Project1_SRC})
5+
add_executable(Project1Exec "main.cpp")
6+
target_link_libraries(Project1Exec PRIVATE Project1)

Project1/main.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#include "include/erf.hpp"
2+
#include <iostream>
3+
4+
int main()
5+
{
6+
std::cout<<"Erf of 0.0 = "<<erf1(0.0)<<std::endl;
7+
}

Project1/src/erf.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,4 @@
33
double erf1(double a)
44
{
55
return std::erf(a);
6-
}
7-
8-
int main()
9-
{
10-
std::cout<<"Erf of 0.0 = "<<erf1(0.0)<<std::endl;
116
}

Project2/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
file(GLOB Project2_SRC
2-
"src/*.cpp"
3-
)
1+
file(GLOB Project2_SRC "src/*.cpp")
42
include_directories(.)
53
add_library(Project2 STATIC ${Project2_SRC})
6-
set_property(TARGET Project2 PROPERTY POSITION_INDEPENDENT_CODE ON)
4+
set_property(TARGET Project2 PROPERTY POSITION_INDEPENDENT_CODE ON)
5+
add_executable(Project2Exec "main.cpp")
6+
target_link_libraries(Project2Exec PRIVATE Project2)

Project2/main.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#include "include/cos.hpp"
2+
#include <iostream>
3+
4+
int main()
5+
{
6+
std::cout<<"Cos of 0.0 = "<<cos1(0.0)<<std::endl;
7+
}

Project3/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
file(GLOB Project3_SRC
2-
"src/*.cpp"
3-
)
1+
file(GLOB Project3_SRC "src/*.cpp")
42
include_directories(.)
53
add_library(Project3 STATIC ${Project3_SRC})
6-
set_property(TARGET Project3 PROPERTY POSITION_INDEPENDENT_CODE ON)
4+
set_property(TARGET Project3 PROPERTY POSITION_INDEPENDENT_CODE ON)
5+
add_executable(Project3Exec "main.cpp")
6+
target_link_libraries(Project3Exec PRIVATE Project3)

Project3/main.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#include "include/sin.hpp"
2+
#include <iostream>
3+
4+
int main()
5+
{
6+
std::cout<<"Sin of 0.0 = "<<sin1(0.0)<<std::endl;
7+
}

main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55

66
int main()
77
{
8-
auto p=erf(1.0)*sin(1.0)*cos(1.0);
8+
auto p=erf1(1.0)*sin1(1.0)*cos1(1.0);
99
std::cout<<"Result is "<<p<<std::endl;
1010
}

0 commit comments

Comments
 (0)