fixed cmakes

projects/Fdvm/CMakeLists.txt

@@ -31,9 +31,10 @@ endforeach ()
 set(SOURCE_LIB
         ${sagepp_sources}/libSage++.cpp
         ${sage_include_1}/libSage++.h)
-
 		
-# if not default ${sagepp_sources} must be set in ../paths.txt
+# if not default ${sagepp_sources} must be set in ../paths.tx
+file(GLOB FDVM_HEADERS ${fdvm_include}/*.h)
+
 set(SOURCE_EXE
         ${fdvm_sources}/acc.cpp
 		 ${fdvm_sources}/acc_across.cpp
@@ -58,7 +59,8 @@ set(SOURCE_EXE
 		 ${fdvm_sources}/omp.cpp
 		 ${fdvm_sources}/ompdebug.cpp
 		 ${fdvm_sources}/parloop.cpp
-		 ${fdvm_sources}/stmt.cpp)
+		 ${fdvm_sources}/stmt.cpp
+         ${FDVM_HEADERS})
 
 source_group (SageLib FILES ${SOURCE_LIB})
 

projects/Parser/CMakeLists.txt

@@ -29,6 +29,8 @@ foreach (NameAndValue ${SAPFOR_PATHS})
 endforeach ()
 
 # if not default ${sagepp_sources} must be set in ../paths.txt
+file(GLOB PARSER_HEADERS ${parser_sources}/*.h)
+
 set(SOURCE_EXE
         ${parser_sources}/cftn.c
         ${parser_sources}/errors.c
@@ -43,10 +45,10 @@ set(SOURCE_EXE
         ${parser_sources}/sym.c
         ${parser_sources}/types.c
         ${parser_sources}/unparse_hpf.c
-        )
+        ${PARSER_HEADERS})
 
-# if not default ${fdvm_include}, ${sage_include_1}, ${sage_include_2} must be set in ../paths.txt
-include_directories(${fdvm_include} ${sage_include_1} ${sage_include_2})
+# if not default ${sage_include_1}, ${sage_include_2} must be set in ../paths.txt
+include_directories(${sage_include_1} ${sage_include_2})
 add_executable(Parser ${SOURCE_EXE})
 
 if (MSVC_IDE)

projects/SageLib/CMakeLists.txt

@@ -33,8 +33,8 @@ set(SOURCE_LIB
         ${sage_include_1}/libSage++.h 
         )
 
-# if not default ${fdvm_include}, ${sage_include_1}, ${sage_include_2} must be set in ../paths.txt
-include_directories(${fdvm_include} ${sage_include_1} ${sage_include_2})
+# if not default ${sage_include_1}, ${sage_include_2} must be set in ../paths.txt
+include_directories(${sage_include_1} ${sage_include_2})
 add_library(SageLib STATIC ${SOURCE_LIB})
 
 add_subdirectory(../SageOldSrc ${CMAKE_CURRENT_BINARY_DIR}/SageOldSrc)

projects/SageNewSrc/CMakeLists.txt

@@ -29,16 +29,20 @@ foreach (NameAndValue ${SAPFOR_PATHS})
 endforeach ()
 
 # if not default ${sage_sources} must be set in ../paths.txt
+file(GLOB SAGE_HEADERS1 ${sage_include_1}/*.h)
+file(GLOB SAGE_HEADERS2 ${sage_include_2}/*.h)
+
 set(SOURCE_LIB
         ${sage_sources}/annotate.tab.c
         ${sage_sources}/comments.c
         ${sage_sources}/low_level.c
         ${sage_sources}/toolsann.c
         ${sage_sources}/unparse.c
-        )
+        ${SAGE_HEADERS1}
+        ${SAGE_HEADERS2})
 
-# if not default ${fdvm_include}, ${sage_include_1}, ${sage_include_2} must be set in ../paths.txt
-include_directories(${fdvm_include} ${sage_include_1} ${sage_include_2})
+# if not default ${sage_include_1}, ${sage_include_2} must be set in ../paths.txt
+include_directories(${sage_include_1} ${sage_include_2})
 add_library(SageNewSrc STATIC ${SOURCE_LIB})
 
 add_subdirectory(../SageOldSrc ${CMAKE_CURRENT_BINARY_DIR}/SageOldSrc)

projects/SageOldSrc/CMakeLists.txt

@@ -28,6 +28,9 @@ foreach (NameAndValue ${SAPFOR_PATHS})
     set(${Name} "../${Value}")
 endforeach ()
 
+file(GLOB SAGE_HEADERS1 ${sage_include_1}/*.h)
+file(GLOB SAGE_HEADERS2 ${sage_include_2}/*.h)
+
 # if not default ${libdb_sources} must be set in ../paths.txt
 set(SOURCE_LIB
         ${libdb_sources}/anal_ind.c
@@ -48,10 +51,11 @@ set(SOURCE_LIB
         ${libdb_sources}/setutils.c
         ${libdb_sources}/symb_alg.c
         ${libdb_sources}/writenodes.c
-        )
+        ${SAGE_HEADERS1}
+        ${SAGE_HEADERS2})
 
-# if not default ${fdvm_include}, ${sage_include_1}, ${sage_include_2} must be set in ../paths.txt
-include_directories(${fdvm_include} ${sage_include_1} ${sage_include_2})
+# if not default ${sage_include_1}, ${sage_include_2} must be set in ../paths.txt
+include_directories(${sage_include_1} ${sage_include_2})
 add_library(SageOldSrc STATIC ${SOURCE_LIB})
 
 if (MSVC_IDE)