Merge branch 'master' of github.com:wegamekinglc/Derivatives-Algorith…

…ms-Lib

.gitmodules

@@ -12,4 +12,4 @@
 	url = [email protected]:auto-differentiation/xad.git
 [submodule "externals/adept"]
 	path = externals/adept
-	url = [email protected]:rjhogan/Adept-2.git
+	url = [email protected]:wegamekinglc/Adept-2.git

CMakeLists.txt

@@ -41,11 +41,6 @@ set(DAL_INSTALL_INCLUDEDIR "include" CACHE STRING "Installation directory for he
 set(DAL_INSTALL_EXAMPLESDIR "lib/dal/examples" CACHE STRING "Installation directory for examples")
 set(DAL_INSTALL_CMAKEDIR "lib/cmake/${PACKAGE_NAME}" CACHE STRING "Installation directory for CMake scripts")
 
-if (NOT "${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
-    add_definitions(-DCODI_ForcedInlines)
-    message("-- using forced inline for Codi")
-endif()
-
 # Project shared libs ON for UNIX
 if (NOT DEFINED BUILD_SHARED_LIBS)
     set(BUILD_SHARED_LIBS ${UNIX})

build_windows.bat

@@ -80,6 +80,32 @@ if "%ADDRESS_MODEL%"=="Win64" (
   )
 )
 
+cd externals/adept
+
+if exist build (
+  rem build folder already exists.
+) else (
+  mkdir build
+)
+
+echo Starting build adept
+cd build
+if "%ADDRESS_MODEL%"=="Win64" (
+cmake -G "%MSVC_VERSION% %ADDRESS_MODEL%" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_INSTALL_PREFIX=%DAL_DIR%\externals\adept\build -DMSVC_RUNTIME=%MSVC_RUNTIME% ..
+) else (
+cmake -G "%MSVC_VERSION%" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% -DCMAKE_INSTALL_PREFIX=%DAL_DIR%\externals\adept\build -DMSVC_RUNTIME=%MSVC_RUNTIME% ..
+)
+if %errorlevel% neq 0 exit /b 1
+
+msbuild dal.sln /m /p:Configuration=%BUILD_TYPE% /p:Platform=%PLATFORM%
+msbuild INSTALL.vcxproj /m:%NUMBER_OF_PROCESSORS% /p:Configuration=%BUILD_TYPE% /p:Platform=%PLATFORM%
+
+if %errorlevel% neq 0 exit /b 1
+
+echo End build adept
+
+cd ../../..
+
 if exist build (
   rem build folder already exists.
 ) else (

examples/aad/CMakeLists.txt

@@ -6,8 +6,8 @@ target_link_libraries(aad dal_library)
 if(MSVC)
 else()
     target_link_libraries(aad pthread)
-    target_link_libraries(aad libadept.a)
 endif()
+target_link_libraries(aad adept)
 
 install(TARGETS aad
         RUNTIME DESTINATION bin